From 908d2c30f17fde642dd672c2bcce31baf9d1d0f0 Mon Sep 17 00:00:00 2001
From: Bryan Schumaker <bjschuma@netapp.com>
Date: Fri, 27 Apr 2012 13:27:42 -0400
Subject: [PATCH] --- yaml --- r: 299903 b: refs/heads/master c:
 7e6eb683d260d9325f0d1bd911518d5ed3cb4f0c h: refs/heads/master i:   299901:
 6a1fdaca382e46d97dee42fe275475fcc35d3bda   299899:
 f5b707268437d7e5ebb8a669e9937f7dd42de588   299895:
 e123bd885779c7ed868382fe15890c7c9ee22f1e   299887:
 0893e09acd1ca194817959d3225b27595797fc5f   299871:
 283fc4a85d31956ef8a058d765769fa20a51363a   299839:
 33e819c23a640609ed5e30556ac2a5864d3c439c   299775:
 02d47f1cdbbb6fca1f893d53ed05111dab728095 v: v3

---
 [refs]                   | 2 +-
 trunk/fs/nfs/client.c    | 5 +++--
 trunk/fs/nfs/internal.h  | 3 ++-
 trunk/fs/nfs/namespace.c | 3 +--
 trunk/fs/nfs/super.c     | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index a89365411d96..facaeb308055 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f05d147f7e3cf0d86b3a4bd5603029a7cb109633
+refs/heads/master: 7e6eb683d260d9325f0d1bd911518d5ed3cb4f0c
diff --git a/trunk/fs/nfs/client.c b/trunk/fs/nfs/client.c
index da7b5e4ff9ec..60f7e4ec842c 100644
--- a/trunk/fs/nfs/client.c
+++ b/trunk/fs/nfs/client.c
@@ -1729,7 +1729,8 @@ struct nfs_server *nfs4_create_referral_server(struct nfs_clone_mount *data,
  */
 struct nfs_server *nfs_clone_server(struct nfs_server *source,
 				    struct nfs_fh *fh,
-				    struct nfs_fattr *fattr)
+				    struct nfs_fattr *fattr,
+				    rpc_authflavor_t flavor)
 {
 	struct nfs_server *server;
 	struct nfs_fattr *fattr_fsinfo;
@@ -1758,7 +1759,7 @@ struct nfs_server *nfs_clone_server(struct nfs_server *source,
 
 	error = nfs_init_server_rpcclient(server,
 			source->client->cl_timeout,
-			source->client->cl_auth->au_flavor);
+			flavor);
 	if (error < 0)
 		goto out_free_server;
 	if (!IS_ERR(source->client_acl))
diff --git a/trunk/fs/nfs/internal.h b/trunk/fs/nfs/internal.h
index 49c09b4a535a..b777bdaba4c5 100644
--- a/trunk/fs/nfs/internal.h
+++ b/trunk/fs/nfs/internal.h
@@ -165,7 +165,8 @@ extern struct nfs_server *nfs4_create_referral_server(struct nfs_clone_mount *,
 extern void nfs_free_server(struct nfs_server *server);
 extern struct nfs_server *nfs_clone_server(struct nfs_server *,
 					   struct nfs_fh *,
-					   struct nfs_fattr *);
+					   struct nfs_fattr *,
+					   rpc_authflavor_t);
 extern void nfs_mark_client_ready(struct nfs_client *clp, int state);
 extern int nfs4_check_client_ready(struct nfs_client *clp);
 extern struct nfs_client *nfs4_set_ds_client(struct nfs_client* mds_clp,
diff --git a/trunk/fs/nfs/namespace.c b/trunk/fs/nfs/namespace.c
index b9a593d056b3..78dde307317f 100644
--- a/trunk/fs/nfs/namespace.c
+++ b/trunk/fs/nfs/namespace.c
@@ -257,7 +257,6 @@ struct vfsmount *nfs_d_automount(struct path *path)
 	struct nfs_fh *fh = NULL;
 	struct nfs_fattr *fattr = NULL;
 	struct rpc_clnt *client;
-	rpc_authflavor_t flavor = RPC_AUTH_UNIX;
 
 	dprintk("--> nfs_d_automount()\n");
 
@@ -285,7 +284,7 @@ struct vfsmount *nfs_d_automount(struct path *path)
 	if (fattr->valid & NFS_ATTR_FATTR_V4_REFERRAL)
 		mnt = nfs_do_refmount(client, path->dentry);
 	else
-		mnt = nfs_do_submount(path->dentry, fh, fattr, flavor);
+		mnt = nfs_do_submount(path->dentry, fh, fattr, client->cl_auth->au_flavor);
 	rpc_shutdown_client(client);
 
 	if (IS_ERR(mnt))
diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c
index 1e6715f0616c..4ac7fca7e4bf 100644
--- a/trunk/fs/nfs/super.c
+++ b/trunk/fs/nfs/super.c
@@ -2428,7 +2428,7 @@ nfs_xdev_mount(struct file_system_type *fs_type, int flags,
 	dprintk("--> nfs_xdev_mount()\n");
 
 	/* create a new volume representation */
-	server = nfs_clone_server(NFS_SB(data->sb), data->fh, data->fattr);
+	server = nfs_clone_server(NFS_SB(data->sb), data->fh, data->fattr, data->authflavor);
 	if (IS_ERR(server)) {
 		error = PTR_ERR(server);
 		goto out_err_noserver;
@@ -2955,7 +2955,7 @@ nfs4_xdev_mount(struct file_system_type *fs_type, int flags,
 	dprintk("--> nfs4_xdev_mount()\n");
 
 	/* create a new volume representation */
-	server = nfs_clone_server(NFS_SB(data->sb), data->fh, data->fattr);
+	server = nfs_clone_server(NFS_SB(data->sb), data->fh, data->fattr, data->authflavor);
 	if (IS_ERR(server)) {
 		error = PTR_ERR(server);
 		goto out_err_noserver;