diff options
author | 2008-04-28 02:16:30 -0700 | |
---|---|---|
committer | 2008-04-28 08:58:47 -0700 | |
commit | 73f20e58b1d586e9f6d3ddc3aad872829aca7743 (patch) | |
tree | cd426ad1186438a0b16ade918e73c0b84c4bbe92 | |
parent | fat: use __getname() (diff) | |
download | linux-73f20e58b1d586e9f6d3ddc3aad872829aca7743.tar.gz linux-73f20e58b1d586e9f6d3ddc3aad872829aca7743.tar.bz2 linux-73f20e58b1d586e9f6d3ddc3aad872829aca7743.zip |
FAT_VALID_MEDIA(): remove pointless test
The on-disk media specification field in FAT is only 8-bits, so testing for
<=0xff is pointless, and can generate a "comparison is always true due to
limited range of data type" warning.
While we're there, convert FAT_VALID_MEDIA() into a C function - the present
implementation is buggy: it generates either one or two references to its
argument.
Cc: Frank Seidel <fseidel@suse.de>
Acked-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | fs/fat/inode.c | 2 | ||||
-rw-r--r-- | include/linux/msdos_fs.h | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/fs/fat/inode.c b/fs/fat/inode.c index 1604a8a5c01f..bf918929e793 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c @@ -1215,7 +1215,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, */ media = b->media; - if (!FAT_VALID_MEDIA(media)) { + if (!fat_valid_media(media)) { if (!silent) printk(KERN_ERR "FAT: invalid media value (0x%02x)\n", media); diff --git a/include/linux/msdos_fs.h b/include/linux/msdos_fs.h index 0bca157ddca5..b03b27457413 100644 --- a/include/linux/msdos_fs.h +++ b/include/linux/msdos_fs.h @@ -58,7 +58,11 @@ #define MSDOS_DOTDOT ".. " /* "..", padded to MSDOS_NAME chars */ /* media of boot sector */ -#define FAT_VALID_MEDIA(x) ((0xF8 <= (x) && (x) <= 0xFF) || (x) == 0xF0) +static inline int fat_valid_media(u8 media) +{ + return 0xf8 <= media || media == 0xf0; +} + #define FAT_FIRST_ENT(s, x) ((MSDOS_SB(s)->fat_bits == 32 ? 0x0FFFFF00 : \ MSDOS_SB(s)->fat_bits == 16 ? 0xFF00 : 0xF00) | (x)) |