diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-03-02 14:00:20 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-03-02 14:00:20 -0500 |
commit | 7bbceb6f2bdda67054bc66035a9543623e539126 (patch) | |
tree | 901a46726fcadbef13611926b699a6f5752a1397 /fs/nfs | |
parent | 0d71b058092fc98cfef8e8f6d913180a10a55397 (diff) |
NFS: Ensure we display the minor version correctly in /proc/mounts etc.
The 'minorversion' mount option is now deprecated, so we need to display
the minor version number in the 'vers=' format.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r-- | fs/nfs/super.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index ab58bb9b6115..7f0c93f8afe3 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c | |||
@@ -640,7 +640,6 @@ static void nfs_show_nfsv4_options(struct seq_file *m, struct nfs_server *nfss, | |||
640 | struct nfs_client *clp = nfss->nfs_client; | 640 | struct nfs_client *clp = nfss->nfs_client; |
641 | 641 | ||
642 | seq_printf(m, ",clientaddr=%s", clp->cl_ipaddr); | 642 | seq_printf(m, ",clientaddr=%s", clp->cl_ipaddr); |
643 | seq_printf(m, ",minorversion=%u", clp->cl_minorversion); | ||
644 | } | 643 | } |
645 | #else | 644 | #else |
646 | static void nfs_show_nfsv4_options(struct seq_file *m, struct nfs_server *nfss, | 645 | static void nfs_show_nfsv4_options(struct seq_file *m, struct nfs_server *nfss, |
@@ -649,6 +648,15 @@ static void nfs_show_nfsv4_options(struct seq_file *m, struct nfs_server *nfss, | |||
649 | } | 648 | } |
650 | #endif | 649 | #endif |
651 | 650 | ||
651 | static void nfs_show_nfs_version(struct seq_file *m, | ||
652 | unsigned int version, | ||
653 | unsigned int minorversion) | ||
654 | { | ||
655 | seq_printf(m, ",vers=%u", version); | ||
656 | if (version == 4) | ||
657 | seq_printf(m, ".%u", minorversion); | ||
658 | } | ||
659 | |||
652 | /* | 660 | /* |
653 | * Describe the mount options in force on this server representation | 661 | * Describe the mount options in force on this server representation |
654 | */ | 662 | */ |
@@ -676,7 +684,7 @@ static void nfs_show_mount_options(struct seq_file *m, struct nfs_server *nfss, | |||
676 | u32 version = clp->rpc_ops->version; | 684 | u32 version = clp->rpc_ops->version; |
677 | int local_flock, local_fcntl; | 685 | int local_flock, local_fcntl; |
678 | 686 | ||
679 | seq_printf(m, ",vers=%u", version); | 687 | nfs_show_nfs_version(m, version, clp->cl_minorversion); |
680 | seq_printf(m, ",rsize=%u", nfss->rsize); | 688 | seq_printf(m, ",rsize=%u", nfss->rsize); |
681 | seq_printf(m, ",wsize=%u", nfss->wsize); | 689 | seq_printf(m, ",wsize=%u", nfss->wsize); |
682 | if (nfss->bsize != 0) | 690 | if (nfss->bsize != 0) |