summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kara <jack@suse.cz>2012-06-27 20:08:44 +0200
committerBen Hutchings <ben@decadent.org.uk>2012-07-12 04:32:10 +0100
commitdf2a300810d3e2b049ad363aa1081657a5eda8c6 (patch)
tree538feb88b41fc889a9eaf88f2d41ce75c366c0b3
parent83744791d4f628e83a6aa8fd2d3d694daa547204 (diff)
downloadlwn-df2a300810d3e2b049ad363aa1081657a5eda8c6.tar.gz
lwn-df2a300810d3e2b049ad363aa1081657a5eda8c6.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: Ben Hutchings <ben@decadent.org.uk>
-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 87cb24a0ee7b..eea2bfe0a8c7 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -1235,11 +1235,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);