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

Commit e6b92572 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfs-for-4.21-1' of git://git.linux-nfs.org/projects/anna/linux-nfs 

Pull NFS client updates from Anna Schumaker:
 "Stable bugfixes:
   - xprtrdma: Yet another double DMA-unmap # v4.20

  Features:
   - Allow some /proc/sys/sunrpc entries without CONFIG_SUNRPC_DEBUG
   - Per-xprt rdma receive workqueues
   - Drop support for FMR memory registration
   - Make port= mount option optional for RDMA mounts

  Other bugfixes and cleanups:
   - Remove unused nfs4_xdev_fs_type declaration
   - Fix comments for behavior that has changed
   - Remove generic RPC credentials by switching to 'struct cred'
   - Fix crossing mountpoints with different auth flavors
   - Various xprtrdma fixes from testing and auditing the close code
   - Fixes for disconnect issues when using xprtrdma with krb5
   - Clean up and improve xprtrdma trace points
   - Fix NFS v4.2 async copy reboot recovery"

* tag 'nfs-for-4.21-1' of git://git.linux-nfs.org/projects/anna/linux-nfs: (63 commits)
  sunrpc: convert to DEFINE_SHOW_ATTRIBUTE
  sunrpc: Add xprt after nfs4_test_session_trunk()
  sunrpc: convert unnecessary GFP_ATOMIC to GFP_NOFS
  sunrpc: handle ENOMEM in rpcb_getport_async
  NFS: remove unnecessary test for IS_ERR(cred)
  xprtrdma: Prevent leak of rpcrdma_rep objects
  NFSv4.2 fix async copy reboot recovery
  xprtrdma: Don't leak freed MRs
  xprtrdma: Add documenting comment for rpcrdma_buffer_destroy
  xprtrdma: Replace outdated comment for rpcrdma_ep_post
  xprtrdma: Update comments in frwr_op_send
  SUNRPC: Fix some kernel doc complaints
  SUNRPC: Simplify defining common RPC trace events
  NFS: Fix NFSv4 symbolic trace point output
  xprtrdma: Trace mapping, alloc, and dereg failures
  xprtrdma: Add trace points for calls to transport switch methods
  xprtrdma: Relocate the xprtrdma_mr_map trace points
  xprtrdma: Clean up of xprtrdma chunk trace points
  xprtrdma: Remove unused fields from rpcrdma_ia
  xprtrdma: Cull dprintk() call sites
  ...
parents e45428a4 260f71ef

fs/lockd/clntproc.c

+3 −3
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ static int nlm_wait_on_grace(wait_queue_head_t *queue) 
 * Generic NLM call

 */

static int

nlmclnt_call(struct rpc_cred *cred, struct nlm_rqst *req, u32 proc)

nlmclnt_call(const struct cred *cred, struct nlm_rqst *req, u32 proc)

{

	struct nlm_host	*host = req->a_host;

	struct rpc_clnt	*clnt;
@@ -401,7 +401,7 @@ int nlm_async_reply(struct nlm_rqst *req, u32 proc, const struct rpc_call_ops *t 
 *      completion in order to be able to correctly track the lock

 *      state.

 */

static int nlmclnt_async_call(struct rpc_cred *cred, struct nlm_rqst *req, u32 proc, const struct rpc_call_ops *tk_ops)

static int nlmclnt_async_call(const struct cred *cred, struct nlm_rqst *req, u32 proc, const struct rpc_call_ops *tk_ops)

{

	struct rpc_message msg = {

		.rpc_argp	= &req->a_args,
@@ -510,7 +510,7 @@ static int do_vfs_lock(struct file_lock *fl) 
static int

nlmclnt_lock(struct nlm_rqst *req, struct file_lock *fl)

{

	struct rpc_cred *cred = nfs_file_cred(fl->fl_file);

	const struct cred *cred = nfs_file_cred(fl->fl_file);

	struct nlm_host	*host = req->a_host;

	struct nlm_res	*resp = &req->a_res;

	struct nlm_wait *block = NULL;

fs/nfs/blocklayout/blocklayout.c

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ static int decode_sector_number(__be32 **rp, sector_t *sp) 


static struct nfs4_deviceid_node *

bl_find_get_deviceid(struct nfs_server *server,

		const struct nfs4_deviceid *id, struct rpc_cred *cred,

		const struct nfs4_deviceid *id, const struct cred *cred,

		gfp_t gfp_mask)

{

	struct nfs4_deviceid_node *node;

fs/nfs/client.c

+2 −7
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ EXPORT_SYMBOL_GPL(unregister_nfs_version); 
struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_init)

{

	struct nfs_client *clp;

	struct rpc_cred *cred;

	int err = -ENOMEM;



	if ((clp = kzalloc(sizeof(*clp), GFP_KERNEL)) == NULL)
@@ -182,9 +181,7 @@ struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_init) 
	clp->cl_proto = cl_init->proto;

	clp->cl_net = get_net(cl_init->net);



	cred = rpc_lookup_machine_cred("*");

	if (!IS_ERR(cred))

		clp->cl_machine_cred = cred;

	clp->cl_principal = "*";

	nfs_fscache_get_client_cookie(clp);



	return clp;
@@ -246,9 +243,6 @@ void nfs_free_client(struct nfs_client *clp) 
	if (!IS_ERR(clp->cl_rpcclient))

		rpc_shutdown_client(clp->cl_rpcclient);



	if (clp->cl_machine_cred != NULL)

		put_rpccred(clp->cl_machine_cred);



	put_net(clp->cl_net);

	put_nfs_version(clp->cl_nfs_mod);

	kfree(clp->cl_hostname);
@@ -527,6 +521,7 @@ int nfs_create_rpc_client(struct nfs_client *clp, 
		return PTR_ERR(clnt);

	}



	clnt->cl_principal = clp->cl_principal;

	clp->cl_rpcclient = clnt;

	return 0;

}

fs/nfs/delegation.c

+13 −15
Original line number Diff line number Diff line
@@ -26,10 +26,8 @@ 


static void nfs_free_delegation(struct nfs_delegation *delegation)

{

	if (delegation->cred) {

		put_rpccred(delegation->cred);

	put_cred(delegation->cred);

	delegation->cred = NULL;

	}

	kfree_rcu(delegation, rcu);

}
@@ -178,13 +176,13 @@ static int nfs_delegation_claim_opens(struct inode *inode, 
 * @pagemod_limit: write delegation "space_limit"

 *

 */

void nfs_inode_reclaim_delegation(struct inode *inode, struct rpc_cred *cred,

void nfs_inode_reclaim_delegation(struct inode *inode, const struct cred *cred,

				  fmode_t type,

				  const nfs4_stateid *stateid,

				  unsigned long pagemod_limit)

{

	struct nfs_delegation *delegation;

	struct rpc_cred *oldcred = NULL;

	const struct cred *oldcred = NULL;



	rcu_read_lock();

	delegation = rcu_dereference(NFS_I(inode)->delegation);
@@ -195,12 +193,12 @@ void nfs_inode_reclaim_delegation(struct inode *inode, struct rpc_cred *cred, 
			delegation->type = type;

			delegation->pagemod_limit = pagemod_limit;

			oldcred = delegation->cred;

			delegation->cred = get_rpccred(cred);

			delegation->cred = get_cred(cred);

			clear_bit(NFS_DELEGATION_NEED_RECLAIM,

				  &delegation->flags);

			spin_unlock(&delegation->lock);

			rcu_read_unlock();

			put_rpccred(oldcred);

			put_cred(oldcred);

			trace_nfs4_reclaim_delegation(inode, type);

			return;

		}
@@ -341,7 +339,7 @@ nfs_update_inplace_delegation(struct nfs_delegation *delegation, 
 *

 * Returns zero on success, or a negative errno value.

 */

int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred,

int nfs_inode_set_delegation(struct inode *inode, const struct cred *cred,

				  fmode_t type,

				  const nfs4_stateid *stateid,

				  unsigned long pagemod_limit)
@@ -360,7 +358,7 @@ int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, 
	delegation->type = type;

	delegation->pagemod_limit = pagemod_limit;

	delegation->change_attr = inode_peek_iversion_raw(inode);

	delegation->cred = get_rpccred(cred);

	delegation->cred = get_cred(cred);

	delegation->inode = inode;

	delegation->flags = 1<<NFS_DELEGATION_REFERENCED;

	spin_lock_init(&delegation->lock);
@@ -1047,7 +1045,7 @@ void nfs_reap_expired_delegations(struct nfs_client *clp) 
	struct nfs_delegation *delegation;

	struct nfs_server *server;

	struct inode *inode;

	struct rpc_cred *cred;

	const struct cred *cred;

	nfs4_stateid stateid;



restart:
@@ -1069,7 +1067,7 @@ void nfs_reap_expired_delegations(struct nfs_client *clp) 
				nfs_sb_deactive(server->super);

				goto restart;

			}

			cred = get_rpccred_rcu(delegation->cred);

			cred = get_cred_rcu(delegation->cred);

			nfs4_stateid_copy(&stateid, &delegation->stateid);

			clear_bit(NFS_DELEGATION_TEST_EXPIRED, &delegation->flags);

			rcu_read_unlock();
@@ -1078,7 +1076,7 @@ void nfs_reap_expired_delegations(struct nfs_client *clp) 
				nfs_revoke_delegation(inode, &stateid);

				nfs_inode_find_state_and_recover(inode, &stateid);

			}

			put_rpccred(cred);

			put_cred(cred);

			if (nfs4_server_rebooted(clp)) {

				nfs_inode_mark_test_expired_delegation(server,inode);

				iput(inode);
@@ -1173,7 +1171,7 @@ bool nfs4_refresh_delegation_stateid(nfs4_stateid *dst, struct inode *inode) 
 * otherwise "false" is returned.

 */

bool nfs4_copy_delegation_stateid(struct inode *inode, fmode_t flags,

		nfs4_stateid *dst, struct rpc_cred **cred)

		nfs4_stateid *dst, const struct cred **cred)

{

	struct nfs_inode *nfsi = NFS_I(inode);

	struct nfs_delegation *delegation;
@@ -1187,7 +1185,7 @@ bool nfs4_copy_delegation_stateid(struct inode *inode, fmode_t flags, 
		nfs4_stateid_copy(dst, &delegation->stateid);

		nfs_mark_delegation_referenced(delegation);

		if (cred)

			*cred = get_rpccred(delegation->cred);

			*cred = get_cred(delegation->cred);

	}

	rcu_read_unlock();

	return ret;

fs/nfs/delegation.h

+5 −5
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 */

struct nfs_delegation {

	struct list_head super_list;

	struct rpc_cred *cred;

	const struct cred *cred;

	struct inode *inode;

	nfs4_stateid stateid;

	fmode_t type;
@@ -36,9 +36,9 @@ enum { 
	NFS_DELEGATION_TEST_EXPIRED,

};



int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred,

int nfs_inode_set_delegation(struct inode *inode, const struct cred *cred,

		fmode_t type, const nfs4_stateid *stateid, unsigned long pagemod_limit);

void nfs_inode_reclaim_delegation(struct inode *inode, struct rpc_cred *cred,

void nfs_inode_reclaim_delegation(struct inode *inode, const struct cred *cred,

		fmode_t type, const nfs4_stateid *stateid, unsigned long pagemod_limit);

int nfs4_inode_return_delegation(struct inode *inode);

int nfs_async_inode_return_delegation(struct inode *inode, const nfs4_stateid *stateid);
@@ -60,10 +60,10 @@ void nfs_mark_test_expired_all_delegations(struct nfs_client *clp); 
void nfs_reap_expired_delegations(struct nfs_client *clp);



/* NFSv4 delegation-related procedures */

int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4_stateid *stateid, int issync);

int nfs4_proc_delegreturn(struct inode *inode, const struct cred *cred, const nfs4_stateid *stateid, int issync);

int nfs4_open_delegation_recall(struct nfs_open_context *ctx, struct nfs4_state *state, const nfs4_stateid *stateid, fmode_t type);

int nfs4_lock_delegation_recall(struct file_lock *fl, struct nfs4_state *state, const nfs4_stateid *stateid);

bool nfs4_copy_delegation_stateid(struct inode *inode, fmode_t flags, nfs4_stateid *dst, struct rpc_cred **cred);

bool nfs4_copy_delegation_stateid(struct inode *inode, fmode_t flags, nfs4_stateid *dst, const struct cred **cred);

bool nfs4_refresh_delegation_stateid(nfs4_stateid *dst, struct inode *inode);



void nfs_mark_delegation_referenced(struct nfs_delegation *delegation);