diff for duplicates of <20160616070709.GC23129@mwanda> diff --git a/a/1.txt b/N1/1.txt index 1135972..a0b0f77 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -8,9 +8,9 @@ index b1a3471..a2a17e9 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -1576,7 +1576,7 @@ static int handle_mount_opt(struct super_block *sb, char *opt, int token, - } else if (token = Opt_min_batch_time) { + } else if (token == Opt_min_batch_time) { sbi->s_min_batch_time = arg; - } else if (token = Opt_inode_readahead_blks) { + } else if (token == Opt_inode_readahead_blks) { - if (arg && (arg > (1 << 30) || !is_power_of_2(arg))) { + if (arg && (arg > (1U << 30) || !is_power_of_2(arg))) { ext4_msg(sb, KERN_ERR, diff --git a/a/content_digest b/N1/content_digest index 3ae0b43..06966ab 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch] ext4: underflow in alignment check\0" - "Date\0Thu, 16 Jun 2016 07:07:09 +0000\0" + "Date\0Thu, 16 Jun 2016 10:07:09 +0300\0" "To\0Theodore Ts'o <tytso@mit.edu>\0" "Cc\0Andreas Dilger <adilger.kernel@dilger.ca>" linux-ext4@vger.kernel.org @@ -18,13 +18,13 @@ "--- a/fs/ext4/super.c\n" "+++ b/fs/ext4/super.c\n" "@@ -1576,7 +1576,7 @@ static int handle_mount_opt(struct super_block *sb, char *opt, int token,\n" - " \t} else if (token = Opt_min_batch_time) {\n" + " \t} else if (token == Opt_min_batch_time) {\n" " \t\tsbi->s_min_batch_time = arg;\n" - " \t} else if (token = Opt_inode_readahead_blks) {\n" + " \t} else if (token == Opt_inode_readahead_blks) {\n" "-\t\tif (arg && (arg > (1 << 30) || !is_power_of_2(arg))) {\n" "+\t\tif (arg && (arg > (1U << 30) || !is_power_of_2(arg))) {\n" " \t\t\text4_msg(sb, KERN_ERR,\n" " \t\t\t\t \"EXT4-fs: inode_readahead_blks must be \"\n" " \t\t\t\t \"0 or a power of 2 smaller than 2^31\");" -ee00c4fbb5f32f6b4759d2a84f0e706a1552097ba759eadbde43d25744e138a4 +275c2600eb25043b62f2700ecd47606423ee98909fdeb1ff70611484857b4d40
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.