Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cf047c9 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4.1: Ensure we use the correct credentials for bind_conn_to_session 



Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
Cc: Weston Andros Adamson <dros@netapp.com>
parent 848f5bda

fs/nfs/nfs4_fs.h

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ struct vfsmount *nfs4_submount(struct nfs_server *, struct dentry *, 
extern int nfs4_proc_setclientid(struct nfs_client *, u32, unsigned short, struct rpc_cred *, struct nfs4_setclientid_res *);

extern int nfs4_proc_setclientid_confirm(struct nfs_client *, struct nfs4_setclientid_res *arg, struct rpc_cred *);

extern int nfs4_proc_get_rootfh(struct nfs_server *, struct nfs_fh *, struct nfs_fsinfo *);

extern int nfs4_proc_bind_conn_to_session(struct nfs_client *);

extern int nfs4_proc_bind_conn_to_session(struct nfs_client *, struct rpc_cred *cred);

extern int nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred);

extern int nfs4_init_clientid(struct nfs_client *, struct rpc_cred *);

extern int nfs41_init_clientid(struct nfs_client *, struct rpc_cred *);

fs/nfs/nfs4proc.c

+2 −1
Original line number Diff line number Diff line
@@ -5105,7 +5105,7 @@ nfs41_same_server_scope(struct nfs41_server_scope *a, 
 * The 4.1 client currently uses the same TCP connection for the

 * fore and backchannel.

 */

int nfs4_proc_bind_conn_to_session(struct nfs_client *clp)

int nfs4_proc_bind_conn_to_session(struct nfs_client *clp, struct rpc_cred *cred)

{

	int status;

	struct nfs41_bind_conn_to_session_res res;
@@ -5114,6 +5114,7 @@ int nfs4_proc_bind_conn_to_session(struct nfs_client *clp) 
			&nfs4_procedures[NFSPROC4_CLNT_BIND_CONN_TO_SESSION],

		.rpc_argp = clp,

		.rpc_resp = &res,

		.rpc_cred = cred,

	};



	dprintk("--> %s\n", __func__);

fs/nfs/nfs4state.c

+8 −1
Original line number Diff line number Diff line
@@ -1779,7 +1779,14 @@ static int nfs4_recall_slot(struct nfs_client *clp) 


static int nfs4_bind_conn_to_session(struct nfs_client *clp)

{

	return nfs4_proc_bind_conn_to_session(clp);

	struct rpc_cred *cred;

	int ret;



	cred = nfs4_get_exchange_id_cred(clp);

	ret = nfs4_proc_bind_conn_to_session(clp, cred);

	if (cred)

		put_rpccred(cred);

	return ret;

}

#else /* CONFIG_NFS_V4_1 */

static int nfs4_reset_session(struct nfs_client *clp) { return 0; }