From 9148bcb636431c235daf3f5bc4763af0e2bc19db Mon Sep 17 00:00:00 2001 From: "Alexander V. Lukyanov" Date: Mon, 21 Feb 2011 21:33:21 -0500 Subject: [PATCH] --- yaml --- r: 242356 b: refs/heads/master c: 5dbd571d875d73e087c1eeb3d840cfc653a97422 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ext4/super.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5d922bac1a3b..36249cdc21c8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7dc576158d7e5cdff3349f78598fdb4080536342 +refs/heads/master: 5dbd571d875d73e087c1eeb3d840cfc653a97422 diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c index ef83457fd4ea..a1ac24b6a758 100644 --- a/trunk/fs/ext4/super.c +++ b/trunk/fs/ext4/super.c @@ -1771,7 +1771,7 @@ static int parse_options(char *options, struct super_block *sb, return 0; if (option < 0 || option > (1 << 30)) return 0; - if (!is_power_of_2(option)) { + if (option && !is_power_of_2(option)) { ext4_msg(sb, KERN_ERR, "EXT4-fs: inode_readahead_blks" " must be a power of 2"); @@ -2412,7 +2412,7 @@ static ssize_t inode_readahead_blks_store(struct ext4_attr *a, if (parse_strtoul(buf, 0x40000000, &t)) return -EINVAL; - if (!is_power_of_2(t)) + if (t && !is_power_of_2(t)) return -EINVAL; sbi->s_inode_readahead_blks = t;