[pnfs] [PATCH 1/3] pnfs: intialize pnfs on submounts and referrals

[andros at netapp.com]

From: Andy Adamson <andros at netapp.com>

Signed-off-by: Andy Adamson<andros at netapp.com>
---
 fs/nfs/super.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 34d71c8..56afdb2 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1977,11 +1977,9 @@ out_no_client_address:
 /*
  * Initialize the pNFS layout driver and setup pNFS related parameters
  */
-int nfs4_init_pnfs(struct super_block *sb, struct nfs_server *server,
+static void nfs4_init_pnfs(struct super_block *sb, struct nfs_server *server,
 		   struct nfs_fh *fh)
 {
-	int error = 0;
-
 #if defined(CONFIG_PNFS)
 	struct nfs_client *clp;
 
@@ -1995,7 +1993,6 @@ int nfs4_init_pnfs(struct super_block *sb, struct nfs_server *server,
 		break;
 	}
 #endif /* CONFIG_PNFS */
-	return error;
 }
 
 /*
@@ -2205,6 +2202,8 @@ static int nfs4_xdev_get_sb(struct file_system_type *fs_type, int flags,
 
 	security_sb_clone_mnt_opts(data->sb, s);
 
+	nfs4_init_pnfs(s, server, data->fh);
+
 	dprintk("<-- nfs4_xdev_get_sb() = 0\n");
 	return 0;
 
@@ -2290,6 +2289,8 @@ static int nfs4_referral_get_sb(struct file_system_type *fs_type, int flags,
 
 	security_sb_clone_mnt_opts(data->sb, s);
 
+	nfs4_init_pnfs(s, server, data->fh);
+
 	dprintk("<-- nfs4_referral_get_sb() = 0\n");
 	return 0;
 
-- 
1.5.4.1