summaryrefslogtreecommitdiff
path: root/fs/udf
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 09:03:51 -0700
commit132a45d8bdc699d831dcc51cfd4db7238d183b42 (patch)
treec0d4cc02244f2671e11ea0a4db0cf37bc63e052b /fs/udf
parent615fb8b018599cfe16b466b1a1c98cf1c3ecaf0e (diff)
downloadlinux-3.10-132a45d8bdc699d831dcc51cfd4db7238d183b42.tar.gz
linux-3.10-132a45d8bdc699d831dcc51cfd4db7238d183b42.tar.bz2
linux-3.10-132a45d8bdc699d831dcc51cfd4db7238d183b42.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>
Diffstat (limited to 'fs/udf')
-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 ac8a348dcb6..9da6f4ee112 100644
--- a/fs/udf/super.c
+++ b/fs/udf/super.c
@@ -1233,11 +1233,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);