From fb879d0eb7b4e35202c992eea4ee637fbce55cc7 Mon Sep 17 00:00:00 2001
From: "J. Bruce Fields" <bfields@fieldses.org>
Date: Sun, 22 May 2011 19:48:21 +0300
Subject: [PATCH] --- yaml --- r: 252895 b: refs/heads/master c:
 ae50c0b5c6f6fa340f1fe2d244b358145f7e5a15 h: refs/heads/master i:   252893:
 91e2a39944773e0aa3f799b988ad6acb26e3b8b5   252891:
 b86c0820ad2cfbc7e8c766954b97824f78b09d96   252887:
 5a75ad7d3be259d799ed36db9f567ccd8b3ac4ed   252879:
 270430d08bdddd8a20c87e694a9be96590134b97   252863:
 61da60d1f06b5fc832f0b954b6c101f680a69755 v: v3

---
 [refs]               |  2 +-
 trunk/fs/nfs/super.c | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5b5b85039822..c7a804efe192 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 778b5502fdba5b183553f3f2ef1672ba78ac58b6
+refs/heads/master: ae50c0b5c6f6fa340f1fe2d244b358145f7e5a15
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index e288f06d3fa7..ce40e5c568ba 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -63,6 +63,7 @@
 #include "iostat.h"
 #include "internal.h"
 #include "fscache.h"
+#include "pnfs.h"
 
 #define NFSDBG_FACILITY		NFSDBG_VFS
 
@@ -732,6 +733,28 @@ static int nfs_show_options(struct seq_file *m, struct vfsmount *mnt)
 
 	return 0;
 }
+#ifdef CONFIG_NFS_V4_1
+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) {}
+#endif
+
+#ifdef CONFIG_NFS_V4_1
+void show_pnfs(struct seq_file *m, struct nfs_server *server)
+{
+	seq_printf(m, ",pnfs=");
+	if (server->pnfs_curr_ld)
+		seq_printf(m, "%s", server->pnfs_curr_ld->name);
+	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 */
 
 static int nfs_show_devname(struct seq_file *m, struct vfsmount *mnt)
 {
@@ -792,6 +815,8 @@ static int nfs_show_stats(struct seq_file *m, struct vfsmount *mnt)
 		seq_printf(m, "bm0=0x%x", nfss->attr_bitmask[0]);
 		seq_printf(m, ",bm1=0x%x", nfss->attr_bitmask[1]);
 		seq_printf(m, ",acl=0x%x", nfss->acl_bitmask);
+		show_sessions(m, nfss);
+		show_pnfs(m, nfss);
 	}
 #endif