summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2015-03-10 21:44:33 +0100
committerJan Kara <jack@suse.cz>2015-03-14 07:39:32 +0100
commit6fbaad879ae7ba75196b55bab216b9b4d0a541b3 (patch)
tree7ab9d099fc5dbb8681924669583e54a569b18d92 /fs
parentudf: remove unused variable in udf_table_free_blocks() (diff)
downloadlinux-6fbaad879ae7ba75196b55bab216b9b4d0a541b3.tar.xz
linux-6fbaad879ae7ba75196b55bab216b9b4d0a541b3.zip
udf: remove else after return in __load_block_bitmap()
else after return is not needed. Signed-off-by: Fabian Frederick <fabf@skynet.be> Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to '')
-rw-r--r--fs/udf/balloc.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
index 02948f04da56..0ee257a32e45 100644
--- a/fs/udf/balloc.c
+++ b/fs/udf/balloc.c
@@ -63,15 +63,14 @@ static int __load_block_bitmap(struct super_block *sb,
block_group, nr_groups);
}
- if (bitmap->s_block_bitmap[block_group]) {
+ if (bitmap->s_block_bitmap[block_group])
return block_group;
- } else {
- retval = read_block_bitmap(sb, bitmap, block_group,
- block_group);
- if (retval < 0)
- return retval;
- return block_group;
- }
+
+ retval = read_block_bitmap(sb, bitmap, block_group, block_group);
+ if (retval < 0)
+ return retval;
+
+ return block_group;
}
static inline int load_block_bitmap(struct super_block *sb,