33 lines
990 B
Diff
33 lines
990 B
Diff
|
From cb14d340ef1737c24125dd663eff77734a482d47 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jan Kara <jack@suse.cz>
|
||
|
|
Date: Wed, 27 Jun 2012 20:08:44 +0200
|
||
|
|
Subject: udf: Use 'ret' instead of abusing 'i' in udf_load_logicalvol()
|
||
|
|
|
||
|
|
From: Jan Kara <jack@suse.cz>
|
||
|
|
|
||
|
|
commit cb14d340ef1737c24125dd663eff77734a482d47 upstream.
|
||
|
|
|
||
|
|
Signed-off-by: Jan Kara <jack@suse.cz>
|
||
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||
|
|
|
||
|
|
---
|
||
|
|
fs/udf/super.c | 6 ++----
|
||
|
|
1 file changed, 2 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
--- a/fs/udf/super.c
|
||
|
|
+++ b/fs/udf/super.c
|
||
|
|
@@ -1233,11 +1233,9 @@ static int udf_load_logicalvol(struct su
|
||
|
|
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);
|