Skip to contentSkip to conversation

Patch "fs/nfs: fix new compiler warning about boolean in switch" has been added to the 3.18-stable tree

PATCH [email protected] 1 participant 1 message Apr 27, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

fs/nfs: fix new compiler warning about boolean in switch

to the 3.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
fs-nfs-fix-new-compiler-warning-about-boolean-in-switch.patch
and it can be found in the queue-3.18 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From c7757074839f2cd440521482d76ea180d0d4bdac Mon Sep 17 00:00:00 2001

From: Andre Przywara <[email protected]>
Date: Thu, 23 Apr 2015 17:17:40 +0100
Subject: fs/nfs: fix new compiler warning about boolean in switch

From: Andre Przywara <[email protected]>

commit c7757074839f2cd440521482d76ea180d0d4bdac upstream.

The brand new GCC 5.1.0 warns by default on using a boolean in the switch condition. This results in the following warning:

fs/nfs/nfs4proc.c: In function 'nfs4_proc_get_rootfh':
fs/nfs/nfs4proc.c:3100:10: warning: switch condition has boolean value [-Wswitch-bool]

  switch (auth_probe) {
          ^

This code was obviously using switch to make use of the fall-through semantics (without the usual comment, though).
Rewrite that code using if statements to avoid the warning and make the code a bit more readable on the way.

---
 fs/nfs/nfs4proc.c |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
fs/nfs/nfs4proc.c +4 -7
@@ -3057,16 +3057,13 @@ int nfs4_proc_get_rootfh(struct nfs_serv
 			 struct nfs_fsinfo *info,
 			 bool auth_probe)
 {
-	int status;
+	int status = 0;
 
-	switch (auth_probe) {
-	case false:
+	if (!auth_probe)
 		status = nfs4_lookup_root(server, fhandle, info);
-		if (status != -NFS4ERR_WRONGSEC)
-			break;
-	default:
+
+	if (auth_probe || status == NFS4ERR_WRONGSEC)
 		status = nfs4_do_find_root_sec(server, fhandle, info);
-	}
 
 	if (status == 0)
 		status = nfs4_server_capabilities(server, fhandle);

Patches currently in stable-queue which might be from [email protected] are

queue-3.18/fs-nfs-fix-new-compiler-warning-about-boolean-in-switch.patch