lkml.org 
[lkml]   [2011]   [Sep]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] nfs/super.c: local functions should be static
    Date
    commit ae50c0b5 "pnfs: client stats" added additional information to
    the output of /proc/self/mountstats. The new functions introduced are
    only used in this file and should be marked static.

    If CONFIG_NFS_V4_1 is not defined, empty stub functions are used. If
    CONFIG_NFS_V4 is not defined these stub functions are not used at all.
    Adding static for the functions results in compile warnings:

    fs/nfs/super.c:743: warning: 'show_sessions' defined but not used
    fs/nfs/super.c:756: warning: 'show_pnfs' defined but not used

    Fix this by adding a #ifdef CONFIG_NFS_V4 guard around the two
    show_ functions.

    Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
    Cc: Trond Myklebust <Trond.Myklebust@netapp.com>

    ---

    diff --git a/fs/nfs/super.c b/fs/nfs/super.c
    index b961cea..4b07e9b 100644
    --- a/fs/nfs/super.c
    +++ b/fs/nfs/super.c
    @@ -733,18 +733,22 @@ static int nfs_show_options(struct seq_file *m, struct vfsmount *mnt)

    return 0;
    }
    +
    +#ifdef CONFIG_NFS_V4
    #ifdef CONFIG_NFS_V4_1
    -void show_sessions(struct seq_file *m, struct nfs_server *server)
    +static void show_sessions(struct seq_file *m, struct nfs_server *server)
    {
    if (nfs4_has_session(server->nfs_client))
    seq_printf(m, ",sessions");
    }
    #else
    -void show_sessions(struct seq_file *m, struct nfs_server *server) {}
    +static void show_sessions(struct seq_file *m, struct nfs_server *server) {}
    +#endif
    #endif

    +#ifdef CONFIG_NFS_V4
    #ifdef CONFIG_NFS_V4_1
    -void show_pnfs(struct seq_file *m, struct nfs_server *server)
    +static void show_pnfs(struct seq_file *m, struct nfs_server *server)
    {
    seq_printf(m, ",pnfs=");
    if (server->pnfs_curr_ld)
    @@ -752,9 +756,10 @@ void show_pnfs(struct seq_file *m, struct nfs_server *server)
    else
    seq_printf(m, "not configured");
    }
    -#else /* CONFIG_NFS_V4_1 */
    -void show_pnfs(struct seq_file *m, struct nfs_server *server) {}
    -#endif /* CONFIG_NFS_V4_1 */
    +#else
    +static void show_pnfs(struct seq_file *m, struct nfs_server *server) {}
    +#endif
    +#endif

    static int nfs_show_devname(struct seq_file *m, struct vfsmount *mnt)
    {

    \
     
     \ /
      Last update: 2011-09-02 23:41    [W:0.023 / U:149.988 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site