diff options
author | vignesh babu <vignesh.babu@wipro.com> | 2007-10-17 02:27:14 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 11:42:53 -0400 |
commit | d8ea6cf89991000ae458e34e36379814cf202555 (patch) | |
tree | 267324741b51696f4e5642ff4f53746cee78e4cc | |
parent | 3befe7ceb8d39a56a9ea55dd2da8b4bd9ddcdd36 (diff) |
ext2/4: use is_power_of_2()
Replace n & (n - 1) with is_power_of_2(n)
Signed-off-by: vignesh babu <vignesh.babu@wipro.com>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | fs/ext2/super.c | 3 | ||||
-rw-r--r-- | fs/ext4/super.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/fs/ext2/super.c b/fs/ext2/super.c index 3e78af2ae7d8..51b4c43b97e4 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <linux/vfs.h> | 30 | #include <linux/vfs.h> |
31 | #include <linux/seq_file.h> | 31 | #include <linux/seq_file.h> |
32 | #include <linux/mount.h> | 32 | #include <linux/mount.h> |
33 | #include <linux/log2.h> | ||
33 | #include <asm/uaccess.h> | 34 | #include <asm/uaccess.h> |
34 | #include "ext2.h" | 35 | #include "ext2.h" |
35 | #include "xattr.h" | 36 | #include "xattr.h" |
@@ -862,7 +863,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) | |||
862 | sbi->s_inode_size = le16_to_cpu(es->s_inode_size); | 863 | sbi->s_inode_size = le16_to_cpu(es->s_inode_size); |
863 | sbi->s_first_ino = le32_to_cpu(es->s_first_ino); | 864 | sbi->s_first_ino = le32_to_cpu(es->s_first_ino); |
864 | if ((sbi->s_inode_size < EXT2_GOOD_OLD_INODE_SIZE) || | 865 | if ((sbi->s_inode_size < EXT2_GOOD_OLD_INODE_SIZE) || |
865 | (sbi->s_inode_size & (sbi->s_inode_size - 1)) || | 866 | !is_power_of_2(sbi->s_inode_size) || |
866 | (sbi->s_inode_size > blocksize)) { | 867 | (sbi->s_inode_size > blocksize)) { |
867 | printk ("EXT2-fs: unsupported inode size: %d\n", | 868 | printk ("EXT2-fs: unsupported inode size: %d\n", |
868 | sbi->s_inode_size); | 869 | sbi->s_inode_size); |
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 0e829cc8a18a..4c8d31c61454 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -1738,7 +1738,7 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent) | |||
1738 | if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_64BIT)) { | 1738 | if (EXT4_HAS_INCOMPAT_FEATURE(sb, EXT4_FEATURE_INCOMPAT_64BIT)) { |
1739 | if (sbi->s_desc_size < EXT4_MIN_DESC_SIZE_64BIT || | 1739 | if (sbi->s_desc_size < EXT4_MIN_DESC_SIZE_64BIT || |
1740 | sbi->s_desc_size > EXT4_MAX_DESC_SIZE || | 1740 | sbi->s_desc_size > EXT4_MAX_DESC_SIZE || |
1741 | sbi->s_desc_size & (sbi->s_desc_size - 1)) { | 1741 | !is_power_of_2(sbi->s_desc_size)) { |
1742 | printk(KERN_ERR | 1742 | printk(KERN_ERR |
1743 | "EXT4-fs: unsupported descriptor size %lu\n", | 1743 | "EXT4-fs: unsupported descriptor size %lu\n", |
1744 | sbi->s_desc_size); | 1744 | sbi->s_desc_size); |