lkml.org 
[lkml]   [2017]   [Apr]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 10/19] fs/nfs: fix new compiler warning about boolean in switch
    3.16.43-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    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>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Cc: Arnd Bergmann <arnd@arndb.de>
    ---
    fs/nfs/nfs4proc.c | 11 ++++-------
    1 file changed, 4 insertions(+), 7 deletions(-)

    --- a/fs/nfs/nfs4proc.c
    +++ b/fs/nfs/nfs4proc.c
    @@ -3000,16 +3000,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);
    \
     
     \ /
      Last update: 2017-04-01 15:24    [W:4.135 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site