From c5bfe12ec0bd4326d5c86528b36b9f51ee9c5399 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Fri, 18 Jun 2010 12:23:58 -0400
Subject: [PATCH] --- yaml --- r: 200503 b: refs/heads/master c:
 0be8189f2c87fcc747d6a4a657a0b6e2161b2318 h: refs/heads/master i:   200501:
 87b755442f64c92a4e41ed74692b20aa30e37817   200499:
 eb570d540debaa82a66e60a05dee600a02c27f99   200495:
 b2f3b52204b6b9f4980e31de635f829458df8bdd v: v3

---
 [refs]               |  2 +-
 trunk/fs/nfs/super.c | 22 ++++++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 0ba68f0be42c..e8351c03b651 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44950b67a6239b377a9e6fd52c498b310bcdd713
+refs/heads/master: 0be8189f2c87fcc747d6a4a657a0b6e2161b2318
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index 04214fc5c304..f9df16de4a56 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -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");
 }