summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2012-06-27 20:08:44 +0200
committerMarkus Lehtonen <markus.lehtonen@linux.intel.com>2013-04-05 09:13:03 +0300
commit3364bf1a77af87dd3da5ae82b7b928ad44ea8c10 (patch)
treea53a28fff8367bf4e17a1d6ae3185b07f9b09a72
parent90f84eb026439fa6578b9341381ebc1a7e96a5f4 (diff)
downloadkernel-mfld-blackbay-3364bf1a77af87dd3da5ae82b7b928ad44ea8c10.tar.gz
kernel-mfld-blackbay-3364bf1a77af87dd3da5ae82b7b928ad44ea8c10.tar.bz2
kernel-mfld-blackbay-3364bf1a77af87dd3da5ae82b7b928ad44ea8c10.zip
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 3286dfcac53..04e9e0fd105 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);