Ticket #8974: 0229-Fix-typos-super-block-superblock-8974.patch

docs/develop/kernel/boot/boot_process_specs_x86.html

@@ -28 +28 @@
         </p>
         <p>
         It resides in the first first 1024 bytes of a BFS disk which usually refers to the
-        first two sectors of the partition in question. Since the BFS super block is located
+        first two sectors of the partition in question. Since the BFS superblock is located
         at byte offset 512, and about 170 bytes large, this section is already reserved,
         and thus cannot be used by the loader itself.<br>
         The MBR only loads the first sector of a partition into memory, so it has to load
-        the super block (and the rest of its implementation) by itself.
+        the superblock (and the rest of its implementation) by itself.
         </p>
         <p>
         The loader must be able to load the real boot loader from a certain path, and

docs/userguide/en/applications/list-cli-apps.html

@@ -276 +276 @@
 <tr><td><tt>stty</tt></td><td> </td><td>Shows/sets terminal characteristics. </td></tr>
 <tr><td><tt>su</tt></td><td> </td><td>Changes the effective user id and group. </td></tr>
 <tr><td><tt>sum</tt></td><td> </td><td>Prints checksum and block counts for each file. </td></tr>
-<tr><td><tt>sync</tt></td><td> </td><td>Forces changed blocks to disk, updates the super block. </td></tr>
+<tr><td><tt>sync</tt></td><td> </td><td>Forces changed blocks to disk, updates the superblock. </td></tr>
 <tr><td><tt>sysinfo</tt></td><td> </td><td>Shows system info. </td></tr>
 <tr><td colspan="3"><a id="T" name="T"><h2><a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>T</h2></a></td></tr>
 <tr><td><tt>tac</tt></td><td> </td><td>Concatenates and prints files, last line first. </td></tr>

docs/userguide/es/applications/list-cli-apps.html

@@ -277 +277 @@
 <tr><td><tt>stty</tt></td><td> </td><td>Shows/sets terminal characteristics. </td></tr>
 <tr><td><tt>su</tt></td><td> </td><td>Changes the effective user id and group. </td></tr>
 <tr><td><tt>sum</tt></td><td> </td><td>Prints checksum and block counts for each file. </td></tr>
-<tr><td><tt>sync</tt></td><td> </td><td>Forces changed blocks to disk, updates the super block. </td></tr>
+<tr><td><tt>sync</tt></td><td> </td><td>Forces changed blocks to disk, updates the superblock. </td></tr>
 <tr><td><tt>sysinfo</tt></td><td> </td><td>Shows system info. </td></tr>
 <tr><td colspan="3"><a id="T" name="T"><h2><a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>T</h2></a></td></tr>
 <tr><td><tt>tac</tt></td><td> </td><td>Concatenates and prints files, last line first. </td></tr>

docs/userguide/it/applications/list-cli-apps.html

@@ -281 +281 @@
 <tr><td><tt>stty</tt></td><td> </td><td>Visualizza o imposta le caratteristiche del terminale.</td></tr>
 <tr><td><tt>su</tt></td><td> </td><td>Cambia l'effettivo user id e il gruppo.</td></tr>
 <tr><td><tt>sum</tt></td><td> </td><td>Stampa il checksum e il block count per ciascun file.</td></tr>
-<tr><td><tt>sync</tt></td><td> </td><td>Forza i blocchi modificati ad essere scritti sul disco, aggiorna il super block.</td></tr>
+<tr><td><tt>sync</tt></td><td> </td><td>Forza i blocchi modificati ad essere scritti sul disco, aggiorna il superblock.</td></tr>
 <tr><td><tt>sysinfo</tt></td><td> </td><td>Mostra informazioni sul sistema.</td></tr>
 <tr><td colspan="3"><a id="T" name="T"><h2><a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>T</h2></a></td></tr>
 <tr><td><tt>tac</tt></td><td> </td><td>Concatena e stampa file, comincia dall'ultima riga.</td></tr>

docs/userguide/pt_PT/applications/list-cli-apps.html

@@ -277 +277 @@
 <tr><td><tt>stty</tt></td><td> </td><td>Shows/sets terminal characteristics. </td></tr>
 <tr><td><tt>su</tt></td><td> </td><td>Changes the effective user id and group. </td></tr>
 <tr><td><tt>sum</tt></td><td> </td><td>Prints checksum and block counts for each file. </td></tr>
-<tr><td><tt>sync</tt></td><td> </td><td>Forces changed blocks to disk, updates the super block. </td></tr>
+<tr><td><tt>sync</tt></td><td> </td><td>Forces changed blocks to disk, updates the superblock. </td></tr>
 <tr><td><tt>sysinfo</tt></td><td> </td><td>Shows system info. </td></tr>
 <tr><td colspan="3"><a id="T" name="T"><h2><a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>T</h2></a></td></tr>
 <tr><td><tt>tac</tt></td><td> </td><td>Concatenates and prints files, last line first. </td></tr>

docs/userguide/sv_SE/applications/list-cli-apps.html

@@ -280 +280 @@
 <tr><td><tt>stty</tt></td><td> </td><td>Shows/sets terminal characteristics. </td></tr>
 <tr><td><tt>su</tt></td><td> </td><td>Changes the effective user id and group. </td></tr>
 <tr><td><tt>sum</tt></td><td> </td><td>Prints checksum and block counts for each file. </td></tr>
-<tr><td><tt>sync</tt></td><td> </td><td>Forces changed blocks to disk, updates the super block. </td></tr>
+<tr><td><tt>sync</tt></td><td> </td><td>Forces changed blocks to disk, updates the superblock. </td></tr>
 <tr><td><tt>sysinfo</tt></td><td> </td><td>Shows system info. </td></tr>
 <tr><td colspan="3"><a id="T" name="T"><h2><a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>T</h2></a></td></tr>
 <tr><td><tt>tac</tt></td><td> </td><td>Concatenates and prints files, last line first. </td></tr>

docs/userguide/uk/applications/list-cli-apps.html

@@ -277 +277 @@
 <tr><td><tt>stty</tt></td><td> </td><td>Shows/sets terminal characteristics. </td></tr>
 <tr><td><tt>su</tt></td><td> </td><td>Changes the effective user id and group. </td></tr>
 <tr><td><tt>sum</tt></td><td> </td><td>Prints checksum and block counts for each file. </td></tr>
-<tr><td><tt>sync</tt></td><td> </td><td>Forces changed blocks to disk, updates the super block. </td></tr>
+<tr><td><tt>sync</tt></td><td> </td><td>Forces changed blocks to disk, updates the superblock. </td></tr>
 <tr><td><tt>sysinfo</tt></td><td> </td><td>Shows system info. </td></tr>
 <tr><td colspan="3"><a id="T" name="T"><h2><a href="#"><img src="../../images/up.png" style="border:none;float:right" alt="index" /></a>T</h2></a></td></tr>
 <tr><td><tt>tac</tt></td><td> </td><td>Concatenates and prints files, last line first. </td></tr>

src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp

@@ -597 +597 @@
     memset(buffer, 0, numBits >> 3);
 
     off_t offset = 1;
-        // the bitmap starts directly after the super block
+        // the bitmap starts directly after the superblock
 
     // initialize the AllocationGroup objects and clear the on-disk bitmap
 
@@ -926 +926 @@
 
     fVolume->SuperBlock().used_blocks
         = HOST_ENDIAN_TO_BFS_INT64(fVolume->UsedBlocks() + bestLength);
-        // We are not writing back the disk's super block - it's
+        // We are not writing back the disk's superblock - it's
         // either done by the journaling code, or when the disk
         // is unmounted.
         // If the value is not correct at mount time, it will be

src/add-ons/kernel/file_systems/bfs/Inode.cpp

@@ -2556 +2556 @@
     adds the created inode to that parent directory. If an attribute directory
     is created, it will also automatically  be added to the \a parent inode as
     such. However, the indices root node, and the regular root node won't be
-    added to the super block.
+    added to the superblock.
     It will also create the initial B+tree for the inode if it's a directory
     of any kind.
     \a name may be \c NULL, but only if no \a parent is given.

src/add-ons/kernel/file_systems/bfs/Journal.cpp

@@ -499 +499 @@
             // TODO: eventually check other well known offsets, like the
             // root and index dirs
             if (offset == 0) {
-                // This log entry writes over the super block - check if
+                // This log entry writes over the superblock - check if
                 // it's valid!
                 if (Volume::CheckSuperBlock(data) != B_OK) {
-                    FATAL(("Log contains invalid super block!\n"));
+                    FATAL(("Log contains invalid superblock!\n"));
                     RETURN_ERROR(B_BAD_DATA);
                 }
             }
@@ -663 +663 @@
 
     delete logEntry;
 
-    // update the super block, and change the disk's state, if necessary
+    // update the superblock, and change the disk's state, if necessary
 
     if (update) {
         if (superBlock.log_start == superBlock.log_end)
@@ -671 +671 @@
 
         status_t status = journal->fVolume->WriteSuperBlock();
         if (status != B_OK) {
-            FATAL(("_TransactionWritten: could not write back super block: %s\n",
+            FATAL(("_TransactionWritten: could not write back superblock: %s\n",
                 strerror(status)));
         }
 
@@ -864 +864 @@
     logEntry->SetTransactionID(fTransactionID);
 #endif
 
-    // Update the log end pointer in the super block
+    // Update the log end pointer in the superblock
 
     fVolume->SuperBlock().flags = SUPER_BLOCK_DISK_DIRTY;
     fVolume->SuperBlock().log_end = HOST_ENDIAN_TO_BFS_INT64(logPosition);

src/add-ons/kernel/file_systems/bfs/Volume.cpp

@@ -4 +4 @@
  */
 
 
-//! super block, mounting, etc.
+//! superblock, mounting, etc.
 
 
 #include "Attribute.h"
@@ -342 +342 @@
     if (opener.IsReadOnly())
         fFlags |= VOLUME_READ_ONLY;
 
-    // read the super block
+    // read the superblock
     if (Identify(fDevice, &fSuperBlock) != B_OK) {
-        FATAL(("invalid super block!\n"));
+        FATAL(("invalid superblock!\n"));
         return B_BAD_VALUE;
     }
 
-    // initialize short hands to the super block (to save byte swapping)
+    // initialize short hands to the superblock (to save byte swapping)
     fBlockSize = fSuperBlock.BlockSize();
     fBlockShift = fSuperBlock.BlockShift();
     fAllocationGroupShift = fSuperBlock.AllocationGroupShift();
@@ -633 +633 @@
     }
 
 #ifndef BFS_LITTLE_ENDIAN_ONLY
-    // For PPC, the super block might be located at offset 0
+    // For PPC, the superblock might be located at offset 0
     superBlock = (disk_super_block*)data;
     if (superBlock->IsValid()) {
         if (_offset != NULL)
@@ -692 +692 @@
 
     off_t numBlocks = deviceSize / blockSize;
 
-    // create valid super block
+    // create valid superblock
 
     fSuperBlock.Initialize(name, numBlocks, blockSize);
 
-    // initialize short hands to the super block (to save byte swapping)
+    // initialize short hands to the superblock (to save byte swapping)
     fBlockSize = fSuperBlock.BlockSize();
     fBlockShift = fSuperBlock.BlockShift();
     fAllocationGroupShift = fSuperBlock.AllocationGroupShift();

src/add-ons/kernel/file_systems/btrfs/Volume.cpp

@@ -5 +5 @@
  */
 
 
-//! Super block, mounting, etc.
+//! Superblock, mounting, etc.
 
 
 #include "Volume.h"
@@ -270 +270 @@
     if (opener.IsReadOnly())
         fFlags |= VOLUME_READ_ONLY;
 
-    // read the super block
+    // read the superblock
     status_t status = Identify(fDevice, &fSuperBlock);
     if (status != B_OK) {
         ERROR("Volume::Mount(): Identify() failed\n");
@@ -526 +526 @@
         return B_IO_ERROR;
 
     if (!superBlock->IsValid()) {
-        ERROR("invalid super block!\n");
+        ERROR("invalid superblock!\n");
         return B_BAD_VALUE;
     }
 

src/add-ons/kernel/file_systems/exfat/Volume.cpp

@@ -5 +5 @@
  */
 
 
-//! Super block, mounting, etc.
+//! Superblock, mounting, etc.
 
 
 #include "Volume.h"
@@ -310 +310 @@
     if (opener.IsReadOnly())
         fFlags |= VOLUME_READ_ONLY;
 
-    // read the super block
+    // read the superblock
     status_t status = Identify(fDevice, &fSuperBlock);
     if (status != B_OK) {
         ERROR("Volume::Mount(): Identify() failed\n");
@@ -502 +502 @@
         return B_IO_ERROR;
 
     if (!superBlock->IsValid()) {
-        ERROR("invalid super block!\n");
+        ERROR("invalid superblock!\n");
         return B_BAD_VALUE;
     }
 

src/add-ons/kernel/file_systems/ext2/Journal.cpp

@@ -702 +702 @@
     if (status != B_OK)
         return status;
     
-    TRACE("Journal::_LoadSuperBlock(): super block physical block: %llu\n",
+    TRACE("Journal::_LoadSuperBlock(): superblock physical block: %llu\n",
         superblockPos);
     
     JournalSuperBlock superblock;

src/add-ons/kernel/file_systems/ext2/Volume.cpp

@@ -5 +5 @@
  */
 
 
-//! Super block, mounting, etc.
+//! Superblock, mounting, etc.
 
 
 #include "Volume.h"
@@ -300 +300 @@
         fSuperBlock.CompatibleFeatures(), fSuperBlock.IncompatibleFeatures(),
         fSuperBlock.ReadOnlyFeatures());
 
-    // read the super block
+    // read the superblock
     status_t status = Identify(fDevice, &fSuperBlock);
     if (status != B_OK) {
         FATAL("Volume::Mount(): Identify() failed\n");
@@ -311 +311 @@
     if (!IsReadOnly() && _UnsupportedReadOnlyFeatures(fSuperBlock) != 0)
         return B_UNSUPPORTED;
 
-    // initialize short hands to the super block (to save byte swapping)
+    // initialize short hands to the superblock (to save byte swapping)
     fBlockShift = fSuperBlock.BlockShift();
     if (fBlockShift < 10 || fBlockShift > 16)
         return B_ERROR;
@@ -930 +930 @@
         return B_IO_ERROR;
 
     if (!superBlock->IsValid()) {
-        FATAL("invalid super block!\n");
+        FATAL("invalid superblock!\n");
         return B_BAD_VALUE;
     }
 

src/add-ons/kernel/file_systems/reiserfs/SuperBlock.cpp

@@ -30 +30 @@
 
 /*!
     \class DirEntry
-    \brief Represents the on-disk structure for super block of the FS.
+    \brief Represents the on-disk structure for superblock of the FS.
 
     There exist two versions of the structure and this class can deal with both
     of them. This class can also handle a very old layout that puts the super
     block in a different location. The Init() methods tries to find and read
-    the super block from disk.
+    the superblock from disk.
 */
 
 // read_super_block
@@ -47 +47 @@
 {
     super_block_t *superBlock = NULL;
     status_t error = B_OK;
-    // allocate memory for the super block
+    // allocate memory for the superblock
     if (error == B_OK) {
         superBlock = new(nothrow) super_block_t;
         if (!superBlock)
             error = B_NO_MEMORY;
     }
-    // read the super block
+    // read the superblock
     if (error == B_OK) {
         size_t size = sizeof(super_block_t);
         if (read_pos(device, offset, superBlock, size) != (int32)size)

src/add-ons/kernel/file_systems/reiserfs/Volume.cpp

@@ -57 +57 @@
     \brief Represents a volume.
 
     The Volume class bundles all functionality related to a volume.
-    It knows the super block and has some basic functionality needed
+    It knows the superblock and has some basic functionality needed
     for handling VNodes. Actually it should be the layer that provides the
     abstraction from VNodes. The design is not strict in this respect
     (the whole thing evolved while I was in the process of understanding
@@ -97 +97 @@
     if (fDevice < 0)
         return B_ERROR;
 
-    // read and analyze super block
+    // read and analyze superblock
     return _ReadSuperBlock();
 }
 
@@ -130 +130 @@
         if (fDevice < 0)
             SET_ERROR(error, errno);
     }
-    // read and analyze super block
+    // read and analyze superblock
     if (error == B_OK)
         error = _ReadSuperBlock();
 
@@ -534 +534 @@
         error = B_NO_MEMORY;
     // check FS state
     if (error == B_OK && fSuperBlock->GetState() != REISERFS_VALID_FS) {
-        FATAL(("The super block indicates a non-valid FS! Bailing out."));
+        FATAL(("The superblock indicates a non-valid FS! Bailing out."));
         error = B_ERROR;
     }
     // check FS version
     if (error == B_OK && fSuperBlock->GetVersion() > REISERFS_VERSION_2) {
-        FATAL(("The super block indicates a version greater than 2 (%u)! "
+        FATAL(("The superblock indicates a version greater than 2 (%u)! "
                "Bailing out.", fSuperBlock->GetVersion()));
         error = B_ERROR;
     }

src/add-ons/kernel/file_systems/reiserfs/reiserfs.h

@@ -220 +220 @@
 //
 
 //
-// super block's field values
+// superblock's field values
 //
 #define REISERFS_VERSION_0 0 /* undistributed bitmap */
 #define REISERFS_VERSION_1 1 /* distributed bitmap and resizer*/
@@ -232 +232 @@
 #define R5_HASH   3
 #define DEFAULT_HASH R5_HASH
 
-/* this is the on disk super block */
+/* this is the on disk superblock */
 
 struct reiserfs_super_block
 {

src/add-ons/kernel/file_systems/userlandfs/userlandfs

@@ -39 +39 @@
         is_buffer           false
     }
 
-    # dump super block
+    # dump superblock
     ioctl 56743 {
         buffer_size         0
         write_buffer_size   0

src/bin/bfs_tools/bfsinfo.cpp

@@ -118 +118 @@
     if (argc < 2 || !strcmp(argv[1], "--help")) {
         char *filename = strrchr(argv[0],'/');
         fprintf(stderr,"usage: %s [-srib] <device> [allocation_group start]\n"
-                "\t-s\tdump super block\n"
+                "\t-s\tdump superblock\n"
                 "\t-r\tdump root node\n"
                 "       the following options need the allocation_group/start "
                     "parameters:\n"
@@ -214 +214 @@
     }
 
     if (disk.ValidateSuperBlock() < B_OK) {
-        fprintf(stderr, "The disk's super block is corrupt (or it's not a BFS "
+        fprintf(stderr, "The disk's superblock is corrupt (or it's not a BFS "
             "device)!\n");
         return 0;
     }

src/bin/bfs_tools/bfswhich.cpp

@@ -286 +286 @@
     }
 
     if (disk.ValidateSuperBlock() != B_OK) {
-        fprintf(stderr, "The disk's super block is corrupt!\n");
+        fprintf(stderr, "The disk's superblock is corrupt!\n");
         return -1;
     }
 
@@ -307 +307 @@
             disk.Log().allocation_group, disk.Log().start,
             disk.Log().length);
     } else if (block < 1) {
-        printf("Super Block intersects\n");
+        printf("Superblock intersects\n");
     } else if (block < 1 + disk.BitmapSize()) {
         printf("Block bitmap intersects (start %d, end %lu)\n", 1,
             disk.BitmapSize());

src/bin/bfs_tools/chkindex.cpp

@@ -479 +479 @@
     
     if (disk.ValidateSuperBlock() < B_OK)
     {
-        fprintf(stderr,"The disk's super block is corrupt!\n");
+        fprintf(stderr,"The disk's superblock is corrupt!\n");
         return -1;
     }
     

src/bin/bfs_tools/lib/Disk.cpp

@@ -2 +2 @@
  * Copyright (c) 2001-2008 pinc Software. All Rights Reserved.
  */
 
-//! Handles BFS super block, disk access etc.
+//! Handles BFS superblock, disk access etc.
 
 #include "Disk.h"
 #include "dump.h"
@@ -155 +155 @@
 
     if (fFile.ReadAt(512 + fRawDiskOffset, &fSuperBlock,
             sizeof(disk_super_block)) < 1)
-        fprintf(stderr,"Disk: Could not read super block\n");
+        fprintf(stderr,"Disk: Could not read superblock\n");
 
     //dump_super_block(&fSuperBlock);
 }
@@ -274 +274 @@
                 printf("\n(%ld) *** BFS superblock found at: %Ld\n",superBlocks.CountItems() + 1,offset);
                 dump_super_block(super);
 
-                // add a copy of the super block to the list
+                // add a copy of the superblock to the list
                 bfs_disk_info *info = (bfs_disk_info *)malloc(sizeof(bfs_disk_info));
                 if (info == NULL)
                     return B_NO_MEMORY;
 
                 memcpy(&info->super_block, super, sizeof(disk_super_block));
                 info->offset = offset + i - 512;
-                    /* location off the BFS super block is 512 bytes after the partition start */
+                    /* location off the BFS superblock is 512 bytes after the partition start */
                 superBlocks.AddItem(info);
             }
         }
     }
 
     if (superBlocks.CountItems() == 0) {
-        puts("\nCouldn't find any BFS super blocks!");
+        puts("\nCouldn't find any BFS superblocks!");
         return B_ENTRY_NOT_FOUND;
     }
 
@@ -408 +408 @@
     bfs_inode indexDir;
     bfs_inode rootDir;
     if (ScanForIndexAndRoot(&indexDir,&rootDir) < B_OK) {
-        fprintf(stderr,"ERROR: Could not find root directory! Trying to recreate the super block will have no effect!\n\tSetting standard values for the root dir.\n");
+        fprintf(stderr,"ERROR: Could not find root directory! Trying to recreate the superblock will have no effect!\n\tSetting standard values for the root dir.\n");
         rootDir.inode_num.allocation_group = 8;
         rootDir.inode_num.start = 0;
         rootDir.inode_num.length = 1;

src/bin/bfs_tools/lib/Disk.h

@@ -1 +1 @@
 #ifndef DISK_H
 #define DISK_H
-/* Disk - handles BFS super block, disk access etc.
+/* Disk - handles BFS superblock, disk access etc.
 **
 ** Copyright (c) 2001-2003 pinc Software. All Rights Reserved.
 */

src/bin/bfs_tools/recover.cpp

@@ -669 +669 @@
         "\t-i\trecreate indices on target disk\n"
         "\t-d\tdump missing and recreated i-nodes\n"
         "\t-r\tdisk access in raw mode (use only if the partition table is invalid)\n"
-        "\t-s\trecreate super block and exit (for experts only, don't use this\n"
+        "\t-s\trecreate superblock and exit (for experts only, don't use this\n"
         "\t\tif you don't know what you're doing)\n"
         "\t-v\tverbose output\n", name);
     exit(-1);
@@ -764 +764 @@
     bool recreatedSuperBlock = false;
 
     if (disk.ValidateSuperBlock() < B_OK) {
-        fprintf(stderr, "The disk's super block is corrupt!\n");
+        fprintf(stderr, "The disk's superblock is corrupt!\n");
         if (disk.RecreateSuperBlock() < B_OK) {
-            fprintf(stderr, "Can't recreate the disk's super block, sorry!\n");
+            fprintf(stderr, "Can't recreate the disk's superblock, sorry!\n");
             return -1;
         }
         recreatedSuperBlock = true;
     }
     if (gVerbose) {
-        puts("\n*** The super block:\n");
+        puts("\n*** The superblock:\n");
         dump_super_block(disk.SuperBlock());
     }
 
@@ -785 +785 @@
         status_t status = disk.WriteAt(512, disk.SuperBlock(),
             sizeof(disk_super_block));
         if (status < B_OK) {
-            fprintf(stderr, "Could not write super block: %s!\n",
+            fprintf(stderr, "Could not write superblock: %s!\n",
                 strerror(status));
             return 1;
         }

src/bin/coreutils/man/sync.1

@@ -8 +8 @@
 .SH DESCRIPTION
 .\" Add any additional description here
 .PP
-Force changed blocks to disk, update the super block.
+Force changed blocks to disk, update the superblock.
 .TP
 \fB\-\-help\fR
 display this help and exit

src/bin/coreutils/src/sync.c

@@ -1 @@
-/* sync - update the super block
+/* sync - update the superblock
    Copyright (C) 1994-2004, 2008-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -40 +40 @@
     {
       printf (_("Usage: %s [OPTION]\n"), program_name);
       fputs (_("\
-Force changed blocks to disk, update the super block.\n\
+Force changed blocks to disk, update the superblock.\n\
 \n\
 "), stdout);
       fputs (HELP_OPTION_DESCRIPTION, stdout);

src/system/boot/loader/file_systems/bfs/bfs.cpp

@@ -54 +54 @@
 #endif
     }
 
-    TRACE(("bfs: we do have a valid super block (name = %s)!\n", fSuperBlock.name));
+    TRACE(("bfs: we do have a valid superblock (name = %s)!\n", fSuperBlock.name));
 
     fRootNode = new(nothrow) BFS::Directory(*this, Root());
     if (fRootNode == NULL)

src/system/boot/platform/atari_m68k/devices.cpp

@@ -317 +317 @@
 static off_t
 get_next_check_sum_offset(int32 index, off_t maxSize)
 {
-    // The boot block often contains the disk super block, and should be
+    // The boot block often contains the disk superblock, and should be
     // unique enough for most cases
     if (index < 2)
         return index * 512;

src/system/boot/platform/bios_ia32/devices.cpp

@@ -368 +368 @@
 static off_t
 get_next_check_sum_offset(int32 index, off_t maxSize)
 {
-    // The boot block often contains the disk super block, and should be
+    // The boot block often contains the disk superblock, and should be
     // unique enough for most cases
     if (index < 2)
         return index * 512;

src/system/boot/platform/bios_ia32/stage1.S

@@ -130 +130 @@
     .length             resw    1
 endstruc
 
-; BFS super block
+; BFS superblock
 struc   SuperBlock
     .name           resb    32
     .magic1         resd    1
@@ -665 +665 @@
 
 second_boot_block:
 
-; first comes the BFS super block
+; first comes the BFS superblock
 superblock:
                 %rep sizeof(SuperBlock)
                     db  0

src/tests/add-ons/kernel/file_systems/bfs/dump_log/dump_log.cpp

@@ -147 +147 @@
                 break;
 
             off_t value = array[arrayIndex];
-            printf("%7ld: %Ld%s\n", index, value, value == 0 ? " (super block)" :
+            printf("%7ld: %Ld%s\n", index, value, value == 0 ? " (superblock)" :
                 value < bitmapSize + 1 ? " (bitmap block)" : "");
 
             if (data != NULL) {
@@ -208 +208 @@
 
     disk_super_block superBlock;
     if (read_pos(device, 512, &superBlock, sizeof(disk_super_block)) < (ssize_t)sizeof(disk_super_block)) {
-        fprintf(stderr, "%s: could not read super block.\n", sProgramName);
+        fprintf(stderr, "%s: could not read superblock.\n", sProgramName);
         return -1;
     }
 
     if (!superBlock.IsValid()) {
-        fprintf(stderr, "%s: invalid super block!\n", sProgramName);
+        fprintf(stderr, "%s: invalid superblock!\n", sProgramName);
         return -1;
     }
 

src/tests/add-ons/kernel/file_systems/bfs/fragmenter/fragmenter.cpp

@@ -151 +151 @@
         exit(1);
     }
 
-    // read super block
+    // read superblock
     disk_super_block superBlock;
     read_from(fd, 512, &superBlock, sizeof(superBlock));
 
     if (superBlock.magic1 != SUPER_BLOCK_MAGIC1) {
-        fprintf(stderr, "Error: Bad super block magic. This is probably not a "
+        fprintf(stderr, "Error: Bad superblock magic. This is probably not a "
             "BFS image.\n");
         exit(1);
     }
@@ -172 +172 @@
     int64 blockCount = st.st_size / blockSize;
     if (blockCount != superBlock.num_blocks) {
         fprintf(stderr, "Error: Number of blocks in image and the number in "
-            "the super block differ: %lld vs. %lld\n", blockCount,
+            "the superblock differ: %lld vs. %lld\n", blockCount,
             superBlock.num_blocks);
         exit(1);
     }
@@ -206 +206 @@
 
     printf("bfs_fragmenter: marked %lld blocks used\n", occupiedBlocks);
 
-    // write back the super block
+    // write back the superblock
     superBlock.used_blocks += occupiedBlocks;
     write_to(fd, 512, &superBlock, sizeof(superBlock));
         

src/tests/add-ons/kernel/file_systems/bfs/r5/BlockAllocator.cpp

@@ -568 +568 @@
 
                 fVolume->SuperBlock().used_blocks =
                     HOST_ENDIAN_TO_BFS_INT64(fVolume->UsedBlocks() + numBlocks);
-                    // We are not writing back the disk's super block - it's
+                    // We are not writing back the disk's superblock - it's
                     // either done by the journaling code, or when the disk
                     // is unmounted.
                     // If the value is not correct at mount time, it will be

src/tests/add-ons/kernel/file_systems/bfs/r5/Inode.cpp

@@ -1928 +1928 @@
  *  adds the created inode to that parent directory. If an attribute directory
  *  is created, it will also automatically added to the parent inode as such.
  *  However, the indices root node, and the regular root node won't be added
- *  to the super block.
+ *  to the superblock.
  *  It will also create the initial B+tree for the inode if it's a directory
  *  of any kind.
  *  If the "_id" or "_inode" variable is given and non-NULL to store the inode's

src/tests/add-ons/kernel/file_systems/bfs/r5/Journal.cpp

@@ -307 +307 @@
 
     free(logEntry);
 
-    // update the super block, and change the disk's state, if necessary
+    // update the superblock, and change the disk's state, if necessary
 
     if (update) {
         journal->fVolume->LogStart() = superBlock.log_start;
@@ -317 +317 @@
 
         status_t status = journal->fVolume->WriteSuperBlock();
         if (status != B_OK)
-            FATAL(("blockNotify: could not write back super block: %s\n", strerror(status)));
+            FATAL(("blockNotify: could not write back superblock: %s\n", strerror(status)));
     }
 }
 
@@ -421 +421 @@
 
     fUsed += array->CountItems();
 
-    // Update the log end pointer in the super block
+    // Update the log end pointer in the superblock
     fVolume->SuperBlock().flags = HOST_ENDIAN_TO_BFS_INT32(SUPER_BLOCK_DISK_DIRTY);
     fVolume->SuperBlock().log_end = HOST_ENDIAN_TO_BFS_INT64(logPosition);
     fVolume->LogEnd() = logPosition;

src/tests/add-ons/kernel/file_systems/bfs/r5/ToDo

@@ -76 +76 @@
 general stuff
 
  - There are also some comments with a leading "ToDo:" directly in the code which may not be mentioned here.
- - implement mkbfs (try to do it in OpenBeOS style directly - only write the super block from user space)
+ - implement mkbfs (try to do it in OpenBeOS style directly - only write the superblock from user space)
 
 
 -----

src/tests/add-ons/kernel/file_systems/bfs/r5/Volume.cpp

@@ -3 +3 @@
  * This file may be used under the terms of the MIT License.
  */
 
-//! super block, mounting, etc.
+//! superblock, mounting, etc.
 
 
 #include "Debug.h"
@@ -313 +313 @@
     }
 #endif
 
-    // read the super block
+    // read the superblock
     if (Identify(fDevice, &fSuperBlock) != B_OK) {
-        FATAL(("invalid super block!\n"));
+        FATAL(("invalid superblock!\n"));
         return B_BAD_VALUE;
     }
 
-    // initialize short hands to the super block (to save byte swapping)
+    // initialize short hands to the superblock (to save byte swapping)
     fBlockSize = fSuperBlock.BlockSize();
     fBlockShift = fSuperBlock.BlockShift();
     fAllocationGroupShift = fSuperBlock.AllocationGroupShift();
@@ -537 +537 @@
     if (read_pos(fd, 0, buffer, sizeof(buffer)) != sizeof(buffer))
         return B_IO_ERROR;
 
-    // Note: that does work only for x86, for PowerPC, the super block
+    // Note: that does work only for x86, for PowerPC, the superblock
     // may be located at offset 0!
     memcpy(superBlock, buffer + 512, sizeof(disk_super_block));
     if (!superBlock->IsValid()) {
@@ -583 +583 @@
 
     off_t numBlocks = deviceSize / blockSize;
 
-    // create valid super block
+    // create valid superblock
 
     fSuperBlock.Initialize(name, numBlocks, blockSize);
     
-    // initialize short hands to the super block (to save byte swapping)
+    // initialize short hands to the superblock (to save byte swapping)
     fBlockSize = fSuperBlock.BlockSize();
     fBlockShift = fSuperBlock.BlockShift();
     fAllocationGroupShift = fSuperBlock.AllocationGroupShift();

src/tests/add-ons/kernel/file_systems/fs_shell/mount.c

@@ -191 +191 @@
         myfs->dsb.magic2 != SUPER_BLOCK_MAGIC2 ||
         myfs->dsb.magic3 != SUPER_BLOCK_MAGIC3) {
 
-        printf("warning: super block magic numbers are wrong:\n");
+        printf("warning: superblock magic numbers are wrong:\n");
         printf("0x%x (0x%x) 0x%x (0x%x) 0x%x (0x%x)\n",
                myfs->dsb.magic1, SUPER_BLOCK_MAGIC1,
                myfs->dsb.magic2, SUPER_BLOCK_MAGIC2,
@@ -214 +214 @@
         return 0;
     }
 
-    /* make sure that the partition is as big as the super block
+    /* make sure that the partition is as big as the superblock
        says it is */
     num_dev_blocks = get_num_device_blocks(myfs->fd);
     if (myfs->dsb.num_blocks * myfs->dsb.block_size >
@@ -288 +288 @@
     }
 
     if (read_super_block(myfs) != 0) {
-        printf("could not read super block on device %s\n", device);
+        printf("could not read superblock on device %s\n", device);
         ret = EBADF;
         goto error2;
     }
         
     if (super_block_is_sane(myfs) == 0) {
-        printf("bad super block\n");
+        printf("bad superblock\n");
         ret = EBADF;
         goto error2;
     }

src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/SuperBlock.cpp

@@ -30 +30 @@
 
 /*!
     \class DirEntry
-    \brief Represents the on-disk structure for super block of the FS.
+    \brief Represents the on-disk structure for superblock of the FS.
 
     There exist two versions of the structure and this class can deal with
-    both of them. The Init() methods tries to find and read the super block
+    both of them. The Init() methods tries to find and read the superblock
     from disk.
 */
 
@@ -46 +46 @@
 {
     super_block_t *superBlock = NULL;
     status_t error = B_OK;
-    // allocate memory for the super block
+    // allocate memory for the superblock
     if (error == B_OK) {
         superBlock = new(nothrow) super_block_t;
         if (!superBlock)
             error = B_NO_MEMORY;
     }
-    // read the super block
+    // read the superblock
     if (error == B_OK) {
         size_t size = sizeof(super_block_t);
         if (read_pos(device, offset, superBlock, size) != (int32)size)

src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/Volume.cpp

@@ -53 +53 @@
     \brief Represents a volume.
 
     The Volume class bundles all functionality related to a volume.
-    It knows the super block and has some basic functionality needed
+    It knows the superblock and has some basic functionality needed
     for handling VNodes. Actually it should be the layer that provides the
     abstraction from VNodes. The design is not strict in this respect
     (the whole thing evolved while I was in the process of understanding
@@ -111 +111 @@
         if (fDevice < 0)
             SET_ERROR(error, errno);
     }
-    // read and analyze super block
+    // read and analyze superblock
     if (error == B_OK)
         error = _ReadSuperBlock();
     // create and init block cache
@@ -497 +497 @@
         error = B_NO_MEMORY;
     // check FS state
     if (error == B_OK && fSuperBlock->GetState() != REISERFS_VALID_FS) {
-        FATAL(("The super block indicates a non-valid FS! Bailing out."));
+        FATAL(("The superblock indicates a non-valid FS! Bailing out."));
         error = B_ERROR;
     }
     // check FS version
     if (error == B_OK && fSuperBlock->GetVersion() > REISERFS_VERSION_2) {
-        FATAL(("The super block indicates a version greater than 2 (%u)! "
+        FATAL(("The superblock indicates a version greater than 2 (%u)! "
                "Bailing out.", fSuperBlock->GetVersion()));
         error = B_ERROR;
     }

src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/reiserfs/reiserfs.h

@@ -220 +220 @@
 //
 
 //
-// super block's field values
+// superblock's field values
 //
 #define REISERFS_VERSION_0 0 /* undistributed bitmap */
 #define REISERFS_VERSION_1 1 /* distributed bitmap and resizer*/
@@ -232 +232 @@
 #define R5_HASH   3
 #define DEFAULT_HASH R5_HASH
 
-/* this is the on disk super block */
+/* this is the on disk superblock */
 
 struct reiserfs_super_block
 {

src/tests/add-ons/kernel/file_systems/userlandfs/r5/userlandfs.sample

@@ -39 +39 @@
         is_buffer           false
     }
 
-    # dump super block
+    # dump superblock
     ioctl 56743 {
         buffer_size         0
         write_buffer_size   0

src/tests/system/kernel/file_corruption/fs/BlockAllocator.cpp

@@ -722 +722 @@
 status_t
 BlockAllocator::_UpdateSuperBlock(Transaction& transaction)
 {
-    // write the super block
+    // write the superblock
     Block block;
     if (!block.GetWritable(fVolume, kCheckSumFSSuperBlockOffset / B_PAGE_SIZE,
             transaction)) {

src/tests/system/kernel/file_corruption/fs/Volume.cpp

@@ -209 +209 @@
     transaction.KeepNode(fRootDirectory);
     fRootDirectory->SetHardLinks(1);
 
-    // write the super block
+    // write the superblock
     Block block;
     if (!block.GetZero(this, kCheckSumFSSuperBlockOffset / B_PAGE_SIZE,
             transaction)) {
@@ -432 +432 @@
     // we lock the volume now, to keep the locking order (transaction -> volume)
     MutexLocker locker(fLock);
 
-    // update the super block
+    // update the superblock
     Block block;
     if (!block.GetWritable(this, kCheckSumFSSuperBlockOffset / B_PAGE_SIZE,
             transaction)) {