aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2012-06-27 20:08:44 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-16 08:47:38 -0700
commitf8db7530c08115356964240e4f9cc90fd112d251 (patch)
tree6bcfa72796f8761fdddcaa768f1200af36d58e40
parentf66c6795bdc2dd43b749e90a07c3e1f12caafede (diff)
downloadkernel_samsung_espresso10-f8db7530c08115356964240e4f9cc90fd112d251.zip
kernel_samsung_espresso10-f8db7530c08115356964240e4f9cc90fd112d251.tar.gz
kernel_samsung_espresso10-f8db7530c08115356964240e4f9cc90fd112d251.tar.bz2
udf: Use 'ret' instead of abusing 'i' in udf_load_logicalvol()
commit cb14d340ef1737c24125dd663eff77734a482d47 upstream. Signed-off-by: Jan Kara <jack@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/udf/super.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/udf/super.c b/fs/udf/super.c
index 7f0e18a..0bb6a6d 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -1262,11 +1262,9 @@ static int udf_load_logicalvol(struct super_block *sb, sector_t block,
BUG_ON(ident != TAG_IDENT_LVD);
lvd = (struct logicalVolDesc *)bh->b_data;
- i = udf_sb_alloc_partition_maps(sb, le32_to_cpu(lvd->numPartitionMaps));
- if (i != 0) {
- ret = i;
+ ret = udf_sb_alloc_partition_maps(sb, le32_to_cpu(lvd->numPartitionMaps));
+ if (ret)
goto out_bh;
- }
for (i = 0, offset = 0;
i < sbi->s_partitions && offset < le32_to_cpu(lvd->mapTableLength);