[RFC,v0,42/49] pnfsd: gfs2: use generic file layout pnfs operations vector

Commit Message

Benny Halevy Sept. 26, 2013, 6:42 p.m. UTC

From: Andy Adamson <[e-mail]>

Signed-off-by: Andy Adamson <[e-mail]>
[gfs2: set pnfs_dlm_export_ops only for CONFIG_PNFSD]
Signed-off-by: Benny Halevy <[e-mail]>
Acked-by: Steven Whitehouse <[e-mail]>
Signed-off-by: Benny Halevy <[e-mail]>
---
 fs/gfs2/ops_fstype.c | 4 ++++
 1 file changed, 4 insertions(+)

Patch

diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index 19ff5e8..d16a6e6 100644
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -21,6 +21,7 @@ 
 #include <linux/quotaops.h>
 #include <linux/lockdep.h>
 #include <linux/module.h>
+#include <linux/nfsd/nfs4pnfsdlm.h>
 
 #include "gfs2.h"
 #include "incore.h"
@@ -1154,6 +1155,9 @@  static int fill_super(struct super_block *sb, struct gfs2_args *args, int silent
 	sb->s_op = &gfs2_super_ops;
 	sb->s_d_op = &gfs2_dops;
 	sb->s_export_op = &gfs2_export_ops;
+#if defined(CONFIG_PNFSD)
+	sb->s_pnfs_op = &pnfs_dlm_export_ops;
+#endif /* CONFIG_PNFSD */
 	sb->s_xattr = gfs2_xattr_handlers;
 	sb->s_qcop = &gfs2_quotactl_ops;
 	sb_dqopt(sb)->flags |= DQUOT_QUOTA_SYS_FILE;