|
@@ -63,6 +63,7 @@
|
|
#include "iostat.h"
|
|
#include "iostat.h"
|
|
#include "internal.h"
|
|
#include "internal.h"
|
|
#include "fscache.h"
|
|
#include "fscache.h"
|
|
|
|
+#include "pnfs.h"
|
|
|
|
|
|
#define NFSDBG_FACILITY NFSDBG_VFS
|
|
#define NFSDBG_FACILITY NFSDBG_VFS
|
|
|
|
|
|
@@ -732,6 +733,28 @@ static int nfs_show_options(struct seq_file *m, struct vfsmount *mnt)
|
|
|
|
|
|
return 0;
|
|
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)
|
|
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, "bm0=0x%x", nfss->attr_bitmask[0]);
|
|
seq_printf(m, ",bm1=0x%x", nfss->attr_bitmask[1]);
|
|
seq_printf(m, ",bm1=0x%x", nfss->attr_bitmask[1]);
|
|
seq_printf(m, ",acl=0x%x", nfss->acl_bitmask);
|
|
seq_printf(m, ",acl=0x%x", nfss->acl_bitmask);
|
|
|
|
+ show_sessions(m, nfss);
|
|
|
|
+ show_pnfs(m, nfss);
|
|
}
|
|
}
|
|
#endif
|
|
#endif
|
|
|
|
|