diff options
Diffstat (limited to 'fs')
56 files changed, 88 insertions, 119 deletions
@@ -74,11 +74,11 @@ config EXT3_FS tristate "Ext3 journalling file system support" select JBD help - This is the journaling version of the Second extended file system + This is the journalling version of the Second extended file system (often called ext3), the de facto standard Linux file system (method to organize files on a storage device) for hard disks. - The journaling code included in this driver means you do not have + The journalling code included in this driver means you do not have to run e2fsck (file system checker) on your file systems after a crash. The journal keeps track of any changes that were being made at the time the system crashed, and can ensure that your file system @@ -143,7 +143,7 @@ config EXT3_FS_SECURITY config JBD tristate help - This is a generic journaling layer for block devices. It is + This is a generic journalling layer for block devices. It is currently used by the ext3 and OCFS2 file systems, but it could also be used to add journal support to other file systems or block devices such as RAID or LVM. @@ -183,7 +183,7 @@ config REISERFS_FS tristate "Reiserfs support" help Stores not just filenames but the files themselves in a balanced - tree. Uses journaling. + tree. Uses journalling. Balanced trees are more efficient than traditional file system architectural foundations. @@ -1032,7 +1032,7 @@ config BEFS_FS on files and directories, and database-like indeces on selected attributes. (Also note that this driver doesn't make those features available at this time). It is a 64 bit filesystem, so it supports - extremly large volumes and files. + extremely large volumes and files. If you use this filesystem, you should also say Y to at least one of the NLS (native language support) options below. @@ -1090,7 +1090,7 @@ config JFFS_FS tristate "Journalling Flash File System (JFFS) support" depends on MTD && BLOCK help - JFFS is the Journaling Flash File System developed by Axis + JFFS is the Journalling Flash File System developed by Axis Communications in Sweden, aimed at providing a crash/powerdown-safe file system for disk-less embedded devices. Further information is available at (<http://developer.axis.com/software/jffs/>). @@ -1260,7 +1260,7 @@ config JFFS2_CMODE_NONE config JFFS2_CMODE_PRIORITY bool "priority" help - Tries the compressors in a predefinied order and chooses the first + Tries the compressors in a predefined order and chooses the first successful one. config JFFS2_CMODE_SIZE @@ -1365,7 +1365,7 @@ config SYSV_FS If you have floppies or hard disk partitions like that, it is likely that they contain binaries from those other Unix systems; in order - to run these binaries, you will want to install linux-abi which is a + to run these binaries, you will want to install linux-abi which is a set of kernel modules that lets you run SCO, Xenix, Wyse, UnixWare, Dell Unix and System V programs under Linux. It is available via FTP (user: ftp) from @@ -1950,7 +1950,7 @@ config AFS_FS If you say Y here, you will get an experimental Andrew File System driver. It currently only supports unsecured read-only AFS access. - See <file:Documentation/filesystems/afs.txt> for more intormation. + See <file:Documentation/filesystems/afs.txt> for more information. If unsure, say N. diff --git a/fs/befs/befs_fs_types.h b/fs/befs/befs_fs_types.h index 9095518..63ef1e1 100644 --- a/fs/befs/befs_fs_types.h +++ b/fs/befs/befs_fs_types.h @@ -1,5 +1,5 @@ /* - * include/linux/befs_fs_types.h + * fs/befs/befs_fs_types.h * * Copyright (C) 2001 Will Dyson (will@cs.earlham.edu) * diff --git a/fs/cifs/README b/fs/cifs/README index 5f0e1bd..432e515 100644 --- a/fs/cifs/README +++ b/fs/cifs/README @@ -269,7 +269,7 @@ A partial list of the supported mount options follows: (gid) mount option is specified. For the uid (gid) of newly created files and directories, ie files created since the last mount of the server share, the expected uid - (gid) is cached as as long as the inode remains in + (gid) is cached as long as the inode remains in memory on the client. Also note that permission checks (authorization checks) on accesses to a file occur at the server, but there are cases in which an administrator @@ -375,7 +375,7 @@ A partial list of the supported mount options follows: the local process on newly created files, directories, and devices (create, mkdir, mknod). If the CIFS Unix Extensions are not negotiated, for newly created files and directories - instead of using the default uid and gid specified on the + instead of using the default uid and gid specified on the mount, cache the new file's uid and gid locally which means that the uid for the file can change when the inode is reloaded (or the user remounts the share). @@ -440,7 +440,7 @@ A partial list of the supported mount options follows: create device files and fifos in a format compatible with Services for Unix (SFU). In addition retrieve bits 10-12 of the mode via the SETFILEBITS extended attribute (as - SFU does). In the future the bottom 9 bits of the mode + SFU does). In the future the bottom 9 bits of the mode also will be emulated using queries of the security descriptor (ACL). sign Must use packet signing (helps avoid unwanted data modification diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c index ecf3da9..e77676d 100644 --- a/fs/debugfs/inode.c +++ b/fs/debugfs/inode.c @@ -252,7 +252,7 @@ EXPORT_SYMBOL_GPL(debugfs_create_dir); * * This function removes a file or directory in debugfs that was previously * created with a call to another debugfs function (like - * debufs_create_file() or variants thereof.) + * debugfs_create_file() or variants thereof.) * * This function is required to be called in order for the file to be * removed, no automatic cleanup of files will happen when a module is diff --git a/fs/hfsplus/part_tbl.c b/fs/hfsplus/part_tbl.c index ae78306..1528a6f 100644 --- a/fs/hfsplus/part_tbl.c +++ b/fs/hfsplus/part_tbl.c @@ -1,5 +1,5 @@ /* - * linux/fs/hfs/part_tbl.c + * linux/fs/hfsplus/part_tbl.c * * Copyright (C) 1996-1997 Paul H. Hargrove * This file may be distributed under the terms of the GNU General Public License. diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c index 32a8caf..10be512 100644 --- a/fs/jbd/commit.c +++ b/fs/jbd/commit.c @@ -1,5 +1,5 @@ /* - * linux/fs/commit.c + * linux/fs/jbd/commit.c * * Written by Stephen C. Tweedie <sct@redhat.com>, 1998 * diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c index 7af6099..c518dd8 100644 --- a/fs/jbd/journal.c +++ b/fs/jbd/journal.c @@ -1,5 +1,5 @@ /* - * linux/fs/journal.c + * linux/fs/jbd/journal.c * * Written by Stephen C. Tweedie <sct@redhat.com>, 1998 * diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c index fc95c4d..fe56b38 100644 --- a/fs/nfsd/nfs2acl.c +++ b/fs/nfsd/nfs2acl.c @@ -1,5 +1,5 @@ /* - * linux/fs/nfsd/nfsacl.c + * linux/fs/nfsd/nfs2acl.c * * Process version 2 NFSACL requests. * diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 5446a08..5be0043 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -198,8 +198,7 @@ static char *savemem(struct nfsd4_compoundargs *argp, u32 *p, int nbytes) p = new; memcpy(p, argp->tmp, nbytes); } else { - if (p != argp->tmpp) - BUG(); + BUG_ON(p != argp->tmpp); argp->tmpp = NULL; } if (defer_free(argp, kfree, p)) { diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c index e3a0797..3f14a17 100644 --- a/fs/nfsd/nfsxdr.c +++ b/fs/nfsd/nfsxdr.c @@ -1,5 +1,5 @@ /* - * linux/fs/nfsd/xdr.c + * linux/fs/nfsd/nfsxdr.c * * XDR support for nfsd * diff --git a/fs/nls/nls_ascii.c b/fs/nls/nls_ascii.c index b83381c..6993fae 100644 --- a/fs/nls/nls_ascii.c +++ b/fs/nls/nls_ascii.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_ascii.c + * linux/fs/nls/nls_ascii.c * * Charset ascii translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c index b1317ad..7dfdab9 100644 --- a/fs/nls/nls_base.c +++ b/fs/nls/nls_base.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_base.c + * linux/fs/nls/nls_base.c * * Native language support--charsets and unicode translations. * By Gordon Chaffee 1996, 1997 diff --git a/fs/nls/nls_cp1250.c b/fs/nls/nls_cp1250.c index 32e78cf..570aa69 100644 --- a/fs/nls/nls_cp1250.c +++ b/fs/nls/nls_cp1250.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_cp1250.c + * linux/fs/nls/nls_cp1250.c * * Charset cp1250 translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_cp1251.c b/fs/nls/nls_cp1251.c index cb41c8a..f114afa 100644 --- a/fs/nls/nls_cp1251.c +++ b/fs/nls/nls_cp1251.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_cp1251.c + * linux/fs/nls/nls_cp1251.c * * Charset cp1251 translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_cp1255.c b/fs/nls/nls_cp1255.c index efdeefe..e57f2cb 100644 --- a/fs/nls/nls_cp1255.c +++ b/fs/nls/nls_cp1255.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_cp1255.c + * linux/fs/nls/nls_cp1255.c * * Charset cp1255 translation tables. * The Unicode to charset table has only exact mappings. diff --git a/fs/nls/nls_cp437.c b/fs/nls/nls_cp437.c index 5c4a1cd..d41930c 100644 --- a/fs/nls/nls_cp437.c +++ b/fs/nls/nls_cp437.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_cp437.c + * linux/fs/nls/nls_cp437.c * * Charset cp437 translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_cp737.c b/fs/nls/nls_cp737.c index e8b3ca8..d21f879 100644 --- a/fs/nls/nls_cp737.c +++ b/fs/nls/nls_cp737.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_cp737.c + * linux/fs/nls/nls_cp737.c * * Charset cp737 translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_cp775.c b/fs/nls/nls_cp775.c index bdb290e..c97714c 100644 --- a/fs/nls/nls_cp775.c +++ b/fs/nls/nls_cp775.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_cp775.c + * linux/fs/nls/nls_cp775.c * * Charset cp775 translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_cp850.c b/fs/nls/nls_cp850.c index 25deaa4..843b7d9 100644 --- a/fs/nls/nls_cp850.c +++ b/fs/nls/nls_cp850.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_cp850.c + * linux/fs/nls/nls_cp850.c * * Charset cp850 translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_cp852.c b/fs/nls/nls_cp852.c index b822a7b..83cfd84 100644 --- a/fs/nls/nls_cp852.c +++ b/fs/nls/nls_cp852.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_cp852.c + * linux/fs/nls/nls_cp852.c * * Charset cp852 translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_cp855.c b/fs/nls/nls_cp855.c index e8641b7..9190b7b 100644 --- a/fs/nls/nls_cp855.c +++ b/fs/nls/nls_cp855.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_cp855.c + * linux/fs/nls/nls_cp855.c * * Charset cp855 translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_cp857.c b/fs/nls/nls_cp857.c index 7ba589e..ef3d36d 100644 --- a/fs/nls/nls_cp857.c +++ b/fs/nls/nls_cp857.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_cp857.c + * linux/fs/nls/nls_cp857.c * * Charset cp857 translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_cp860.c b/fs/nls/nls_cp860.c index 3b9e49c..7e2fb66 100644 --- a/fs/nls/nls_cp860.c +++ b/fs/nls/nls_cp860.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_cp860.c + * linux/fs/nls/nls_cp860.c * * Charset cp860 translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_cp861.c b/fs/nls/nls_cp861.c index 959ff64..66d8d80 100644 --- a/fs/nls/nls_cp861.c +++ b/fs/nls/nls_cp861.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_cp861.c + * linux/fs/nls/nls_cp861.c * * Charset cp861 translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_cp862.c b/fs/nls/nls_cp862.c index b96928f..360ba38 100644 --- a/fs/nls/nls_cp862.c +++ b/fs/nls/nls_cp862.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_cp862.c + * linux/fs/nls/nls_cp862.c * * Charset cp862 translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_cp863.c b/fs/nls/nls_cp863.c index baa6e0e..656a931 100644 --- a/fs/nls/nls_cp863.c +++ b/fs/nls/nls_cp863.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_cp863.c + * linux/fs/nls/nls_cp863.c * * Charset cp863 translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_cp864.c b/fs/nls/nls_cp864.c index f4dabb0..01ca730 100644 --- a/fs/nls/nls_cp864.c +++ b/fs/nls/nls_cp864.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_cp864.c + * linux/fs/nls/nls_cp864.c * * Charset cp864 translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_cp865.c b/fs/nls/nls_cp865.c index 4caeafa..5ba6ee1 100644 --- a/fs/nls/nls_cp865.c +++ b/fs/nls/nls_cp865.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_cp865.c + * linux/fs/nls/nls_cp865.c * * Charset cp865 translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_cp866.c b/fs/nls/nls_cp866.c index f2b4a9a..c5f8222 100644 --- a/fs/nls/nls_cp866.c +++ b/fs/nls/nls_cp866.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_cp866.c + * linux/fs/nls/nls_cp866.c * * Charset cp866 translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_cp869.c b/fs/nls/nls_cp869.c index 12b436f..8d40151 100644 --- a/fs/nls/nls_cp869.c +++ b/fs/nls/nls_cp869.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_cp869.c + * linux/fs/nls/nls_cp869.c * * Charset cp869 translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_cp874.c b/fs/nls/nls_cp874.c index b5766a0..df04205 100644 --- a/fs/nls/nls_cp874.c +++ b/fs/nls/nls_cp874.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_cp874.c + * linux/fs/nls/nls_cp874.c * * Charset cp874 translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_cp932.c b/fs/nls/nls_cp932.c index 2c1a17c..2a9ccf3 100644 --- a/fs/nls/nls_cp932.c +++ b/fs/nls/nls_cp932.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_cp932.c + * linux/fs/nls/nls_cp932.c * * Charset cp932 translation tables. * This translation table was generated automatically, the diff --git a/fs/nls/nls_cp936.c b/fs/nls/nls_cp936.c index ef4cef4..046fde8 100644 --- a/fs/nls/nls_cp936.c +++ b/fs/nls/nls_cp936.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_cp936.c + * linux/fs/nls/nls_cp936.c * * Charset cp936 translation tables. * This translation table was generated automatically, the diff --git a/fs/nls/nls_cp949.c b/fs/nls/nls_cp949.c index 4351ae2..92ae193 100644 --- a/fs/nls/nls_cp949.c +++ b/fs/nls/nls_cp949.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_cp949.c + * linux/fs/nls/nls_cp949.c * * Charset cp949 translation tables. * This translation table was generated automatically, the diff --git a/fs/nls/nls_cp950.c b/fs/nls/nls_cp950.c index 8167a28..5665945 100644 --- a/fs/nls/nls_cp950.c +++ b/fs/nls/nls_cp950.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_cp950.c + * linux/fs/nls/nls_cp950.c * * Charset cp950 translation tables. * This translation table was generated automatically, the diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c index 06640c3..7329351 100644 --- a/fs/nls/nls_euc-jp.c +++ b/fs/nls/nls_euc-jp.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_euc-jp.c + * linux/fs/nls/nls_euc-jp.c * * Added `OSF/JVC Recommended Code Set Conversion Specification * between Japanese EUC and Shift-JIS' support: <hirofumi@mail.parknet.co.jp> diff --git a/fs/nls/nls_iso8859-1.c b/fs/nls/nls_iso8859-1.c index 70a2c19..2483c3c 100644 --- a/fs/nls/nls_iso8859-1.c +++ b/fs/nls/nls_iso8859-1.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_iso8859-1.c + * linux/fs/nls/nls_iso8859-1.c * * Charset iso8859-1 translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_iso8859-13.c b/fs/nls/nls_iso8859-13.c index 4547035..7b8721d 100644 --- a/fs/nls/nls_iso8859-13.c +++ b/fs/nls/nls_iso8859-13.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_iso8859-13.c + * linux/fs/nls/nls_iso8859-13.c * * Charset iso8859-13 translation tables. * The Unicode to charset table has only exact mappings. diff --git a/fs/nls/nls_iso8859-14.c b/fs/nls/nls_iso8859-14.c index 13628d0..2e895e6 100644 --- a/fs/nls/nls_iso8859-14.c +++ b/fs/nls/nls_iso8859-14.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_iso8859-14.c + * linux/fs/nls/nls_iso8859-14.c * * Charset iso8859-14 translation tables. * diff --git a/fs/nls/nls_iso8859-15.c b/fs/nls/nls_iso8859-15.c index 88b924b..5c91592 100644 --- a/fs/nls/nls_iso8859-15.c +++ b/fs/nls/nls_iso8859-15.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_iso8859-15.c + * linux/fs/nls/nls_iso8859-15.c * * Charset iso8859-15 translation tables. * The Unicode to charset table has only exact mappings. diff --git a/fs/nls/nls_iso8859-2.c b/fs/nls/nls_iso8859-2.c index 372528a..892d38f 100644 --- a/fs/nls/nls_iso8859-2.c +++ b/fs/nls/nls_iso8859-2.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_iso8859-2.c + * linux/fs/nls/nls_iso8859-2.c * * Charset iso8859-2 translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_iso8859-3.c b/fs/nls/nls_iso8859-3.c index 81b45a2..49317bc 100644 --- a/fs/nls/nls_iso8859-3.c +++ b/fs/nls/nls_iso8859-3.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_iso8859-3.c + * linux/fs/nls/nls_iso8859-3.c * * Charset iso8859-3 translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_iso8859-4.c b/fs/nls/nls_iso8859-4.c index 101b87f..9f3b936 100644 --- a/fs/nls/nls_iso8859-4.c +++ b/fs/nls/nls_iso8859-4.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_iso8859-4.c + * linux/fs/nls/nls_iso8859-4.c * * Charset iso8859-4 translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_iso8859-5.c b/fs/nls/nls_iso8859-5.c index 83b0084..001a2bb 100644 --- a/fs/nls/nls_iso8859-5.c +++ b/fs/nls/nls_iso8859-5.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_iso8859-5.c + * linux/fs/nls/nls_iso8859-5.c * * Charset iso8859-5 translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_iso8859-6.c b/fs/nls/nls_iso8859-6.c index 0c519d6..8cec03d 100644 --- a/fs/nls/nls_iso8859-6.c +++ b/fs/nls/nls_iso8859-6.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_iso8859-6.c + * linux/fs/nls/nls_iso8859-6.c * * Charset iso8859-6 translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_iso8859-7.c b/fs/nls/nls_iso8859-7.c index bd08546..1be707d 100644 --- a/fs/nls/nls_iso8859-7.c +++ b/fs/nls/nls_iso8859-7.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_iso8859-7.c + * linux/fs/nls/nls_iso8859-7.c * * Charset iso8859-7 translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_iso8859-9.c b/fs/nls/nls_iso8859-9.c index 988eff7..8c0146f 100644 --- a/fs/nls/nls_iso8859-9.c +++ b/fs/nls/nls_iso8859-9.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_iso8859-9.c + * linux/fs/nls/nls_iso8859-9.c * * Charset iso8859-9 translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_koi8-r.c b/fs/nls/nls_koi8-r.c index 0ad22c2..fefbe08 100644 --- a/fs/nls/nls_koi8-r.c +++ b/fs/nls/nls_koi8-r.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_koi8-r.c + * linux/fs/nls/nls_koi8-r.c * * Charset koi8-r translation tables. * Generated automatically from the Unicode and charset diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c index 5db83ef..e7bc1d7 100644 --- a/fs/nls/nls_koi8-ru.c +++ b/fs/nls/nls_koi8-ru.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_koi8-ru.c + * linux/fs/nls/nls_koi8-ru.c * * Charset koi8-ru translation based on charset koi8-u. * The Unicode to charset table has only exact mappings. diff --git a/fs/nls/nls_koi8-u.c b/fs/nls/nls_koi8-u.c index 9d30fd6..0150702 100644 --- a/fs/nls/nls_koi8-u.c +++ b/fs/nls/nls_koi8-u.c @@ -1,5 +1,5 @@ /* - * linux/fs/nls_koi8-u.c + * linux/fs/nls/nls_koi8-u.c * * Charset koi8-u translation tables. * The Unicode to charset table has only exact mappings. diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c index 41f2436..c093642 100644 --- a/fs/reiserfs/file.c +++ b/fs/reiserfs/file.c @@ -38,8 +38,7 @@ static int reiserfs_file_release(struct inode *inode, struct file *filp) int err; int jbegin_failure = 0; - if (!S_ISREG(inode->i_mode)) - BUG(); + BUG_ON(!S_ISREG(inode->i_mode)); /* fast out for when nothing needs to be done */ if ((atomic_read(&inode->i_count) > 1 || @@ -125,8 +124,7 @@ static int reiserfs_sync_file(struct file *p_s_filp, int n_err; int barrier_done; - if (!S_ISREG(p_s_inode->i_mode)) - BUG(); + BUG_ON(!S_ISREG(p_s_inode->i_mode)); n_err = sync_mapping_buffers(p_s_inode->i_mapping); reiserfs_write_lock(p_s_inode->i_sb); barrier_done = reiserfs_commit_for_inode(p_s_inode); diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c index 7a88adb..b9b423b 100644 --- a/fs/reiserfs/item_ops.c +++ b/fs/reiserfs/item_ops.c @@ -75,8 +75,7 @@ static int sd_create_vi(struct virtual_node *vn, static int sd_check_left(struct virtual_item *vi, int free, int start_skip, int end_skip) { - if (start_skip || end_skip) - BUG(); + BUG_ON(start_skip || end_skip); return -1; } @@ -87,8 +86,7 @@ static int sd_check_right(struct virtual_item *vi, int free) static int sd_part_size(struct virtual_item *vi, int first, int count) { - if (count) - BUG(); + BUG_ON(count); return 0; } @@ -476,8 +474,7 @@ static int direntry_create_vi(struct virtual_node *vn, vi->vi_index = TYPE_DIRENTRY; - if (!(vi->vi_ih) || !vi->vi_item) - BUG(); + BUG_ON(!(vi->vi_ih) || !vi->vi_item); dir_u->flags = 0; if (le_ih_k_offset(vi->vi_ih) == DOT_OFFSET) @@ -575,8 +572,7 @@ static int direntry_check_right(struct virtual_item *vi, int free) free -= dir_u->entry_sizes[i]; entries++; } - if (entries == dir_u->entry_count) - BUG(); + BUG_ON(entries == dir_u->entry_count); /* "." and ".." can not be separated from each other */ if ((dir_u->flags & DIRENTRY_VI_FIRST_DIRENTRY_ITEM) diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c index e6b5ccf..ad8cbc4 100644 --- a/fs/reiserfs/journal.c +++ b/fs/reiserfs/journal.c @@ -718,8 +718,7 @@ static int add_to_chunk(struct buffer_chunk *chunk, struct buffer_head *bh, spinlock_t * lock, void (fn) (struct buffer_chunk *)) { int ret = 0; - if (chunk->nr >= CHUNK_SIZE) - BUG(); + BUG_ON(chunk->nr >= CHUNK_SIZE); chunk->bh[chunk->nr++] = bh; if (chunk->nr >= CHUNK_SIZE) { ret = 1; @@ -788,8 +787,7 @@ static inline int __add_jh(struct reiserfs_journal *j, struct buffer_head *bh, /* buffer must be locked for __add_jh, should be able to have * two adds at the same time */ - if (bh->b_private) - BUG(); + BUG_ON(bh->b_private); jh->bh = bh; bh->b_private = jh; } @@ -2967,8 +2965,7 @@ static int do_journal_begin_r(struct reiserfs_transaction_handle *th, int retval; reiserfs_check_lock_depth(p_s_sb, "journal_begin"); - if (nblocks > journal->j_trans_max) - BUG(); + BUG_ON(nblocks > journal->j_trans_max); PROC_INFO_INC(p_s_sb, journal.journal_being); /* set here for journal_join */ @@ -3084,9 +3081,8 @@ struct reiserfs_transaction_handle *reiserfs_persistent_transaction(struct if (reiserfs_transaction_running(s)) { th = current->journal_info; th->t_refcount++; - if (th->t_refcount < 2) { - BUG(); - } + BUG_ON(th->t_refcount < 2); + return th; } th = kmalloc(sizeof(struct reiserfs_transaction_handle), GFP_NOFS); @@ -3126,9 +3122,7 @@ static int journal_join(struct reiserfs_transaction_handle *th, ** pointer */ th->t_handle_save = cur_th; - if (cur_th && cur_th->t_refcount > 1) { - BUG(); - } + BUG_ON(cur_th && cur_th->t_refcount > 1); return do_journal_begin_r(th, p_s_sb, nblocks, JBEGIN_JOIN); } @@ -3141,9 +3135,7 @@ int journal_join_abort(struct reiserfs_transaction_handle *th, ** pointer */ th->t_handle_save = cur_th; - if (cur_th && cur_th->t_refcount > 1) { - BUG(); - } + BUG_ON(cur_th && cur_th->t_refcount > 1); return do_journal_begin_r(th, p_s_sb, nblocks, JBEGIN_ABORT); } @@ -3178,8 +3170,7 @@ int journal_begin(struct reiserfs_transaction_handle *th, current->journal_info = th; } ret = do_journal_begin_r(th, p_s_sb, nblocks, JBEGIN_REG); - if (current->journal_info != th) - BUG(); + BUG_ON(current->journal_info != th); /* I guess this boils down to being the reciprocal of clm-2100 above. * If do_journal_begin_r fails, we need to put it back, since journal_end @@ -3324,8 +3315,7 @@ int journal_end(struct reiserfs_transaction_handle *th, /* we aren't allowed to close a nested transaction on a different ** filesystem from the one in the task struct */ - if (cur_th->t_super != th->t_super) - BUG(); + BUG_ON(cur_th->t_super != th->t_super); if (th != cur_th) { memcpy(current->journal_info, th, sizeof(*th)); @@ -3444,9 +3434,7 @@ int journal_end_sync(struct reiserfs_transaction_handle *th, BUG_ON(!th->t_trans_id); /* you can sync while nested, very, very bad */ - if (th->t_refcount > 1) { - BUG(); - } + BUG_ON(th->t_refcount > 1); if (journal->j_len == 0) { reiserfs_prepare_for_journal(p_s_sb, SB_BUFFER_WITH_SB(p_s_sb), 1); @@ -3556,9 +3544,8 @@ static int check_journal_end(struct reiserfs_transaction_handle *th, ** will be dealt with by next transaction that actually writes something, but should be taken ** care of in this trans */ - if (journal->j_len == 0) { - BUG(); - } + BUG_ON(journal->j_len == 0); + /* if wcount > 0, and we are called to with flush or commit_now, ** we wait on j_join_wait. We will wake up when the last writer has ** finished the transaction, and started it on its way to the disk. @@ -3592,9 +3579,8 @@ static int check_journal_end(struct reiserfs_transaction_handle *th, unlock_journal(p_s_sb); } } - if (journal->j_trans_id == trans_id) { - BUG(); - } + BUG_ON(journal->j_trans_id == trans_id); + if (commit_now && journal_list_still_alive(p_s_sb, trans_id) && wait_on_commit) { @@ -4074,9 +4060,7 @@ static int do_journal_end(struct reiserfs_transaction_handle *th, set_commit_trans_len(commit, journal->j_len); /* special check in case all buffers in the journal were marked for not logging */ - if (journal->j_len == 0) { - BUG(); - } + BUG_ON(journal->j_len == 0); /* we're about to dirty all the log blocks, mark the description block * dirty now too. Don't mark the commit block dirty until all the @@ -4173,8 +4157,7 @@ static int do_journal_end(struct reiserfs_transaction_handle *th, journal, jl, &jl->j_tail_bh_list); lock_kernel(); } - if (!list_empty(&jl->j_tail_bh_list)) - BUG(); + BUG_ON(!list_empty(&jl->j_tail_bh_list)); up(&jl->j_commit_lock); /* honor the flush wishes from the caller, simple commits can diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c index 16e9cff..abde1ed 100644 --- a/fs/reiserfs/namei.c +++ b/fs/reiserfs/namei.c @@ -67,8 +67,7 @@ inline void set_de_name_and_namelen(struct reiserfs_dir_entry *de) { struct reiserfs_de_head *deh = de->de_deh + de->de_entry_num; - if (de->de_entry_num >= ih_entry_count(de->de_ih)) - BUG(); + BUG_ON(de->de_entry_num >= ih_entry_count(de->de_ih)); de->de_entrylen = entry_length(de->de_bh, de->de_ih, de->de_entry_num); de->de_namelen = de->de_entrylen - (de_with_sd(deh) ? SD_SIZE : 0); @@ -80,8 +79,7 @@ inline void set_de_name_and_namelen(struct reiserfs_dir_entry *de) // what entry points to static inline void set_de_object_key(struct reiserfs_dir_entry *de) { - if (de->de_entry_num >= ih_entry_count(de->de_ih)) - BUG(); + BUG_ON(de->de_entry_num >= ih_entry_count(de->de_ih)); de->de_dir_id = deh_dir_id(&(de->de_deh[de->de_entry_num])); de->de_objectid = deh_objectid(&(de->de_deh[de->de_entry_num])); } @@ -90,8 +88,7 @@ static inline void store_de_entry_key(struct reiserfs_dir_entry *de) { struct reiserfs_de_head *deh = de->de_deh + de->de_entry_num; - if (de->de_entry_num >= ih_entry_count(de->de_ih)) - BUG(); + BUG_ON(de->de_entry_num >= ih_entry_count(de->de_ih)); /* store key of the found entry */ de->de_entry_key.version = KEY_FORMAT_3_5; diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c index 8b9b131..5240abe 100644 --- a/fs/reiserfs/stree.c +++ b/fs/reiserfs/stree.c @@ -1476,9 +1476,7 @@ static int maybe_indirect_to_direct(struct reiserfs_transaction_handle *th, int n_block_size = p_s_sb->s_blocksize; int cut_bytes; BUG_ON(!th->t_trans_id); - - if (n_new_file_size != p_s_inode->i_size) - BUG(); + BUG_ON(n_new_file_size != p_s_inode->i_size); /* the page being sent in could be NULL if there was an i/o error ** reading in the last block. The user will hit problems trying to diff --git a/fs/xfs/support/debug.c b/fs/xfs/support/debug.c index 36fbecc..c75f683 100644 --- a/fs/xfs/support/debug.c +++ b/fs/xfs/support/debug.c @@ -53,8 +53,7 @@ cmn_err(register int level, char *fmt, ...) va_end(ap); spin_unlock_irqrestore(&xfs_err_lock,flags); - if (level == CE_PANIC) - BUG(); + BUG_ON(level == CE_PANIC); } void @@ -72,8 +71,7 @@ icmn_err(register int level, char *fmt, va_list ap) strcat(message, "\n"); spin_unlock_irqrestore(&xfs_err_lock,flags); printk("%s%s", err_level[level], message); - if (level == CE_PANIC) - BUG(); + BUG_ON(level == CE_PANIC); } void |