| From c7757074839f2cd440521482d76ea180d0d4bdac Mon Sep 17 00:00:00 2001 |
| From: Andre Przywara <andre.przywara@arm.com> |
| Date: Thu, 23 Apr 2015 17:17:40 +0100 |
| Subject: fs/nfs: fix new compiler warning about boolean in switch |
| |
| From: Andre Przywara <andre.przywara@arm.com> |
| |
| 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. |
| |
| Signed-off-by: Andre Przywara <andre.przywara@arm.com> |
| Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> |
| Cc: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| fs/nfs/nfs4proc.c | 11 ++++------- |
| 1 file changed, 4 insertions(+), 7 deletions(-) |
| |
| --- a/fs/nfs/nfs4proc.c |
| +++ b/fs/nfs/nfs4proc.c |
| @@ -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); |