NFSv4: Ensure that /proc/self/mountinfo displays the minor version number
Currently, we do not display the minor version mount parameter in the /proc mount info. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> Cc: stable@kernel.org
This commit is contained in:
parent
44950b67a6
commit
0be8189f2c
|
@ -570,6 +570,22 @@ static void nfs_show_mountd_options(struct seq_file *m, struct nfs_server *nfss,
|
|||
nfs_show_mountd_netid(m, nfss, showdefaults);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_NFS_V4
|
||||
static void nfs_show_nfsv4_options(struct seq_file *m, struct nfs_server *nfss,
|
||||
int showdefaults)
|
||||
{
|
||||
struct nfs_client *clp = nfss->nfs_client;
|
||||
|
||||
seq_printf(m, ",clientaddr=%s", clp->cl_ipaddr);
|
||||
seq_printf(m, ",minorversion=%u", clp->cl_minorversion);
|
||||
}
|
||||
#else
|
||||
static void nfs_show_nfsv4_options(struct seq_file *m, struct nfs_server *nfss,
|
||||
int showdefaults)
|
||||
{
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Describe the mount options in force on this server representation
|
||||
*/
|
||||
|
@ -631,11 +647,9 @@ static void nfs_show_mount_options(struct seq_file *m, struct nfs_server *nfss,
|
|||
|
||||
if (version != 4)
|
||||
nfs_show_mountd_options(m, nfss, showdefaults);
|
||||
else
|
||||
nfs_show_nfsv4_options(m, nfss, showdefaults);
|
||||
|
||||
#ifdef CONFIG_NFS_V4
|
||||
if (clp->rpc_ops->version == 4)
|
||||
seq_printf(m, ",clientaddr=%s", clp->cl_ipaddr);
|
||||
#endif
|
||||
if (nfss->options & NFS_OPTION_FSCACHE)
|
||||
seq_printf(m, ",fsc");
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue