Commit b040ad9c authored Jun 09, 2017 by Arnd Bergmann Committed by Jens Axboe Jun 09, 2017

loop: fix error handling regression



gcc points out an unusual indentation:

drivers/block/loop.c: In function 'loop_set_status':
drivers/block/loop.c:1149:3: error: this 'if' clause does not guard... [-Werror=misleading-indentation]
   if (figure_loop_size(lo, info->lo_offset, info->lo_sizelimit,
   ^~
drivers/block/loop.c:1152:4: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if'
    goto exit;

This was introduced by a new feature that accidentally moved the opening
braces from one condition to another. Adding a second pair of braces
makes it work correctly again and also more readable.

Fixes: f2c6df7d ("loop: support 4k physical blocksize")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jens Axboe <axboe@fb.com>

parent f2c6df7d

drivers/block/loop.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1147,10 +1147,11 @@ loop_set_status(struct loop_device lo, const struct loop_info64 info)
		((lo->lo_flags & LO_FLAGS_BLOCKSIZE) &&
		lo->lo_logical_blocksize != LO_INFO_BLOCKSIZE(info))) {
		if (figure_loop_size(lo, info->lo_offset, info->lo_sizelimit,
		LO_INFO_BLOCKSIZE(info)))
		LO_INFO_BLOCKSIZE(info))) {
		err = -EFBIG;
		goto exit;
		}
		}

		loop_config_discard(lo);

Admin message