Commit 587217f9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull nfs client updates from Anna Schumaker:
 "New Features:
   - Always ask for type with READDIR
   - Remove nfs_writepage()

  Bugfixes:
   - Fix a suspicious RCU usage warning
   - Fix a blocklayoutdriver reference leak
   - Fix the block driver's calculation of layoutget size
   - Fix handling NFS4ERR_RETURNCONFLICT
   - Fix _xprt_switch_find_current_entry()
   - Fix v4.1 backchannel request timeouts
   - Don't add zero-length pnfs block devices
   - Use the parent cred in nfs_access_login_time()

  Cleanups:
   - A few improvements when dealing with referring calls from the
     server
   - Clean up various unused variables, struct fields, and function
     calls
   - Various tracepoint improvements"

* tag 'nfs-for-6.8-1' of git://git.linux-nfs.org/projects/anna/linux-nfs: (21 commits)
  NFSv4.1: Use the nfs_client's rpc timeouts for backchannel
  SUNRPC: Fixup v4.1 backchannel request timeouts
  rpc_pipefs: Replace one label in bl_resolve_deviceid()
  nfs: Remove writepage
  NFS: drop unused nfs_direct_req bytes_left
  pNFS: Fix the pnfs block driver's calculation of layoutget size
  nfs: print fileid in lookup tracepoints
  nfs: rename the nfs_async_rename_done tracepoint
  nfs: add new tracepoint at nfs4 revalidate entry point
  SUNRPC: fix _xprt_switch_find_current_entry logic
  NFSv4.1/pnfs: Ensure we handle the error NFS4ERR_RETURNCONFLICT
  NFSv4.1: if referring calls are complete, trust the stateid argument
  NFSv4: Track the number of referring calls in struct cb_process_state
  NFS: Use parent's objective cred in nfs_access_login_time()
  NFSv4: Always ask for type with READDIR
  pnfs/blocklayout: Don't add zero-length pnfs_block_dev
  blocklayoutdriver: Fix reference leak of pnfs_device_node
  SUNRPC: Fix a suspicious RCU usage warning
  SUNRPC: Create a helper function for accessing the rpc_clnt's xprt_switch
  SUNRPC: Remove unused function rpc_clnt_xprt_switch_put()
  ...
parents 0d19d9e1 57331a59

fs/nfs/blocklayout/blocklayout.c

+4 −3
Original line number Diff line number Diff line
@@ -580,6 +580,8 @@ bl_find_get_deviceid(struct nfs_server *server, 
		nfs4_delete_deviceid(node->ld, node->nfs_client, id);

		goto retry;

	}



	nfs4_put_deviceid_node(node);

	return ERR_PTR(-ENODEV);

}
@@ -893,10 +895,9 @@ bl_pg_init_write(struct nfs_pageio_descriptor *pgio, struct nfs_page *req) 
	}



	if (pgio->pg_dreq == NULL)

		wb_size = pnfs_num_cont_bytes(pgio->pg_inode,

					      req->wb_index);

		wb_size = pnfs_num_cont_bytes(pgio->pg_inode, req->wb_index);

	else

		wb_size = nfs_dreq_bytes_left(pgio->pg_dreq);

		wb_size = nfs_dreq_bytes_left(pgio->pg_dreq, req_offset(req));



	pnfs_generic_pg_init_write(pgio, req, wb_size);

fs/nfs/blocklayout/dev.c

+3 −0
Original line number Diff line number Diff line
@@ -351,6 +351,9 @@ bl_parse_scsi(struct nfs_server *server, struct pnfs_block_dev *d, 
	d->map = bl_map_simple;

	d->pr_key = v->scsi.pr_key;



	if (d->len == 0)

		return -ENODEV;



	pr_info("pNFS: using block device %s (reservation key 0x%llx)\n",

		d->bdev_handle->bdev->bd_disk->disk_name, d->pr_key);

fs/nfs/blocklayout/rpc_pipefs.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ bl_resolve_deviceid(struct nfs_server *server, struct pnfs_block_volume *b, 
	msg->len = sizeof(*bl_msg) + b->simple.len;

	msg->data = kzalloc(msg->len, gfp_mask);

	if (!msg->data)

		goto out_free_data;

		goto out_unlock;



	bl_msg = msg->data;

	bl_msg->type = BL_DEVICE_MOUNT;

fs/nfs/callback.h

+3 −2
Original line number Diff line number Diff line
@@ -21,11 +21,12 @@ enum nfs4_callback_procnum { 


struct nfs4_slot;

struct cb_process_state {

	__be32			drc_status;

	struct nfs_client	*clp;

	struct nfs4_slot	*slot;

	u32			minorversion;

	struct net		*net;

	u32			minorversion;

	__be32			drc_status;

	unsigned int		referring_calls;

};



struct cb_compound_hdr_arg {

fs/nfs/callback_proc.c

+32 −23
Original line number Diff line number Diff line
@@ -207,7 +207,8 @@ static struct inode *nfs_layout_find_inode(struct nfs_client *clp, 
 * Enforce RFC5661 section 12.5.5.2.1. (Layout Recall and Return Sequencing)

 */

static u32 pnfs_check_callback_stateid(struct pnfs_layout_hdr *lo,

					const nfs4_stateid *new)

					const nfs4_stateid *new,

					struct cb_process_state *cps)

{

	u32 oldseq, newseq;
@@ -221,28 +222,29 @@ static u32 pnfs_check_callback_stateid(struct pnfs_layout_hdr *lo, 


	newseq = be32_to_cpu(new->seqid);

	/* Are we already in a layout recall situation? */

	if (test_bit(NFS_LAYOUT_RETURN_REQUESTED, &lo->plh_flags) &&

	    lo->plh_return_seq != 0) {

		if (newseq < lo->plh_return_seq)

			return NFS4ERR_OLD_STATEID;

		if (newseq > lo->plh_return_seq)

	if (test_bit(NFS_LAYOUT_RETURN, &lo->plh_flags))

		return NFS4ERR_DELAY;

		goto out;

	}



	/* Check that the stateid matches what we think it should be. */

	/*

	 * Check that the stateid matches what we think it should be.

	 * Note that if the server sent us a list of referring calls,

	 * and we know that those have completed, then we trust the

	 * stateid argument is correct.

	 */

	oldseq = be32_to_cpu(lo->plh_stateid.seqid);

	if (newseq > oldseq + 1)

	if (newseq > oldseq + 1 && !cps->referring_calls)

		return NFS4ERR_DELAY;



	/* Crazy server! */

	if (newseq <= oldseq)

		return NFS4ERR_OLD_STATEID;

out:



	return NFS_OK;

}



static u32 initiate_file_draining(struct nfs_client *clp,

				  struct cb_layoutrecallargs *args)

				  struct cb_layoutrecallargs *args,

				  struct cb_process_state *cps)

{

	struct inode *ino;

	struct pnfs_layout_hdr *lo;
@@ -266,7 +268,7 @@ static u32 initiate_file_draining(struct nfs_client *clp, 
		goto out;

	}

	pnfs_get_layout_hdr(lo);

	rv = pnfs_check_callback_stateid(lo, &args->cbl_stateid);

	rv = pnfs_check_callback_stateid(lo, &args->cbl_stateid, cps);

	if (rv != NFS_OK)

		goto unlock;
@@ -326,10 +328,11 @@ static u32 initiate_bulk_draining(struct nfs_client *clp, 
}



static u32 do_callback_layoutrecall(struct nfs_client *clp,

				    struct cb_layoutrecallargs *args)

				    struct cb_layoutrecallargs *args,

				    struct cb_process_state *cps)

{

	if (args->cbl_recall_type == RETURN_FILE)

		return initiate_file_draining(clp, args);

		return initiate_file_draining(clp, args, cps);

	return initiate_bulk_draining(clp, args);

}
@@ -340,11 +343,12 @@ __be32 nfs4_callback_layoutrecall(void *argp, void *resp, 
	u32 res = NFS4ERR_OP_NOT_IN_SESSION;



	if (cps->clp)

		res = do_callback_layoutrecall(cps->clp, args);

		res = do_callback_layoutrecall(cps->clp, args, cps);

	return cpu_to_be32(res);

}



static void pnfs_recall_all_layouts(struct nfs_client *clp)

static void pnfs_recall_all_layouts(struct nfs_client *clp,

				    struct cb_process_state *cps)

{

	struct cb_layoutrecallargs args;
@@ -352,7 +356,7 @@ static void pnfs_recall_all_layouts(struct nfs_client *clp) 
	memset(&args, 0, sizeof(args));

	args.cbl_recall_type = RETURN_ALL;

	/* FIXME we ignore errors, what should we do? */

	do_callback_layoutrecall(clp, &args);

	do_callback_layoutrecall(clp, &args, cps);

}



__be32 nfs4_callback_devicenotify(void *argp, void *resp,
@@ -450,6 +454,7 @@ static int referring_call_exists(struct nfs_client *clp, 
	__acquires(lock)

{

	int status = 0;

	int found = 0;

	int i, j;

	struct nfs4_session *session;

	struct nfs4_slot_table *tbl;
@@ -478,11 +483,12 @@ static int referring_call_exists(struct nfs_client *clp, 
			spin_lock(lock);

			if (status)

				goto out;

			found++;

		}

	}



out:

	return status;

	return status < 0 ? status : found;

}



__be32 nfs4_callback_sequence(void *argp, void *resp,
@@ -493,6 +499,7 @@ __be32 nfs4_callback_sequence(void *argp, void *resp, 
	struct nfs4_slot_table *tbl;

	struct nfs4_slot *slot;

	struct nfs_client *clp;

	int ret;

	int i;

	__be32 status = htonl(NFS4ERR_BADSESSION);
@@ -552,11 +559,13 @@ __be32 nfs4_callback_sequence(void *argp, void *resp, 
	 * related callback was received before the response to the original

	 * call.

	 */

	if (referring_call_exists(clp, args->csa_nrclists, args->csa_rclists,

				&tbl->slot_tbl_lock) < 0) {

	ret = referring_call_exists(clp, args->csa_nrclists, args->csa_rclists,

				    &tbl->slot_tbl_lock);

	if (ret < 0) {

		status = htonl(NFS4ERR_DELAY);

		goto out_unlock;

	}

	cps->referring_calls = ret;



	/*

	 * RFC5661 20.9.3
@@ -617,7 +626,7 @@ __be32 nfs4_callback_recallany(void *argp, void *resp, 
		nfs_expire_unused_delegation_types(cps->clp, flags);



	if (args->craa_type_mask & BIT(RCA4_TYPE_MASK_FILE_LAYOUT))

		pnfs_recall_all_layouts(cps->clp);

		pnfs_recall_all_layouts(cps->clp, cps);



	if (args->craa_type_mask & BIT(PNFS_FF_RCA4_TYPE_MASK_READ)) {

		set_bit(NFS4CLNT_RECALL_ANY_LAYOUT_READ, &cps->clp->cl_state);