]> asedeno.scripts.mit.edu Git - linux.git/commit
f2fs: rework fault injection handling to avoid a warning
authorArnd Bergmann <arnd@arndb.de>
Mon, 13 Aug 2018 21:38:06 +0000 (23:38 +0200)
committerJaegeuk Kim <jaegeuk@kernel.org>
Tue, 14 Aug 2018 16:49:15 +0000 (09:49 -0700)
commit7fa750a163089cf96866de402314d853a96cb342
treec47c85285e4213a7c88fbdffd3fc27fcc16a913b
parentd494500a70434223bc35f862fab0679b13bea23d
f2fs: rework fault injection handling to avoid a warning

When CONFIG_F2FS_FAULT_INJECTION is disabled, we get a warning about an
unused label:

fs/f2fs/segment.c: In function '__submit_discard_cmd':
fs/f2fs/segment.c:1059:1: error: label 'submit' defined but not used [-Werror=unused-label]

This could be fixed by adding another #ifdef around it, but the more
reliable way of doing this seems to be to remove the other #ifdefs
where that is easily possible.

By defining time_to_inject() as a trivial stub, most of the checks for
CONFIG_F2FS_FAULT_INJECTION can go away. This also leads to nicer
formatting of the code.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/checkpoint.c
fs/f2fs/data.c
fs/f2fs/dir.c
fs/f2fs/f2fs.h
fs/f2fs/file.c
fs/f2fs/gc.c
fs/f2fs/inode.c
fs/f2fs/node.c
fs/f2fs/recovery.c
fs/f2fs/segment.c