From: Gustavo A. R. Silva <gustavoars@kernel.org>
Date: Mon, 12 Jul 2021 16:09:13 +0000 (-0500)
Subject: fcntl: Fix unreachable code in do_fcntl()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e8865537a68bb3032f449f5eb108fa8cd76ebb6d;p=linux.git

fcntl: Fix unreachable code in do_fcntl()

Fix the following warning:

fs/fcntl.c:373:3: warning: fallthrough annotation in unreachable code [-Wimplicit-fallthrough]
                   fallthrough;
                   ^
   include/linux/compiler_attributes.h:210:41: note: expanded from macro 'fallthrough'
   # define fallthrough                    __attribute__((__fallthrough__))

by placing the fallthrough; statement inside ifdeffery.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
---

diff --git a/fs/fcntl.c b/fs/fcntl.c
index dfc72f15be7fc..f946bec8f1f1b 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -369,8 +369,8 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg,
 	/* 32-bit arches must use fcntl64() */
 	case F_OFD_SETLK:
 	case F_OFD_SETLKW:
-#endif
 		fallthrough;
+#endif
 	case F_SETLK:
 	case F_SETLKW:
 		if (copy_from_user(&flock, argp, sizeof(flock)))