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

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

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

Pull NFS client updates from Anna Schumaker:
 "Highlights include:

  Features:
   - Add support for the NFS v4.2 COPY operation
   - Add support for NFS/RDMA over IPv6

  Bugfixes and cleanups:
   - Avoid race that crashes nfs_init_commit()
   - Fix oops in callback path
   - Fix LOCK/OPEN race when unlinking an open file
   - Choose correct stateids when using delegations in setattr, read and
     write
   - Don't send empty SETATTR after OPEN_CREATE
   - xprtrdma: Prevent server from writing a reply into memory client
     has released
   - xprtrdma: Support using Read list and Reply chunk in one RPC call"

* tag 'nfs-for-4.7-1' of git://git.linux-nfs.org/projects/anna/linux-nfs: (61 commits)
  pnfs: pnfs_update_layout needs to consider if strict iomode checking is on
  nfs/flexfiles: Use the layout segment for reading unless it a IOMODE_RW and reading is disabled
  nfs/flexfiles: Helper function to detect FF_FLAGS_NO_READ_IO
  nfs: avoid race that crashes nfs_init_commit
  NFS: checking for NULL instead of IS_ERR() in nfs_commit_file()
  pnfs: make pnfs_layout_process more robust
  pnfs: rework LAYOUTGET retry handling
  pnfs: lift retry logic from send_layoutget to pnfs_update_layout
  pnfs: fix bad error handling in send_layoutget
  flexfiles: add kerneldoc header to nfs4_ff_layout_prepare_ds
  flexfiles: remove pointless setting of NFS_LAYOUT_RETURN_REQUESTED
  pnfs: only tear down lsegs that precede seqid in LAYOUTRETURN args
  pnfs: keep track of the return sequence number in pnfs_layout_hdr
  pnfs: record sequence in pnfs_layout_segment when it's created
  pnfs: don't merge new ff lsegs with ones that have LAYOUTRETURN bit set
  pNFS/flexfiles: When initing reads or writes, we might have to retry connecting to DSes
  pNFS/flexfiles: When checking for available DSes, conditionally check for MDS io
  pNFS/flexfile: Fix erroneous fall back to read/write through the MDS
  NFS: Reclaim writes via writepage are opportunistic
  NFSv4: Use the right stateid for delegations in setattr, read and write
  ...
parents 0b9210c9 c7d73af2

fs/nfs/callback_proc.c

+6 −3
Original line number Diff line number Diff line
@@ -217,7 +217,8 @@ static u32 initiate_file_draining(struct nfs_client *clp, 
	}



	if (pnfs_mark_matching_lsegs_return(lo, &free_me_list,

					&args->cbl_range)) {

				&args->cbl_range,

				be32_to_cpu(args->cbl_stateid.seqid))) {

		rv = NFS4_OK;

		goto unlock;

	}
@@ -500,8 +501,10 @@ __be32 nfs4_callback_sequence(struct cb_sequenceargs *args, 
	cps->slot = slot;



	/* The ca_maxresponsesize_cached is 0 with no DRC */

	if (args->csa_cachethis != 0)

		return htonl(NFS4ERR_REP_TOO_BIG_TO_CACHE);

	if (args->csa_cachethis != 0) {

		status = htonl(NFS4ERR_REP_TOO_BIG_TO_CACHE);

		goto out_unlock;

	}



	/*

	 * Check for pending referring calls.  If a match is found, a

fs/nfs/callback_xdr.c

+14 −3
Original line number Diff line number Diff line
@@ -146,10 +146,16 @@ static __be32 decode_stateid(struct xdr_stream *xdr, nfs4_stateid *stateid) 
	p = read_buf(xdr, NFS4_STATEID_SIZE);

	if (unlikely(p == NULL))

		return htonl(NFS4ERR_RESOURCE);

	memcpy(stateid, p, NFS4_STATEID_SIZE);

	memcpy(stateid->data, p, NFS4_STATEID_SIZE);

	return 0;

}



static __be32 decode_delegation_stateid(struct xdr_stream *xdr, nfs4_stateid *stateid)

{

	stateid->type = NFS4_DELEGATION_STATEID_TYPE;

	return decode_stateid(xdr, stateid);

}



static __be32 decode_compound_hdr_arg(struct xdr_stream *xdr, struct cb_compound_hdr_arg *hdr)

{

	__be32 *p;
@@ -211,7 +217,7 @@ static __be32 decode_recall_args(struct svc_rqst *rqstp, struct xdr_stream *xdr, 
	__be32 *p;

	__be32 status;



	status = decode_stateid(xdr, &args->stateid);

	status = decode_delegation_stateid(xdr, &args->stateid);

	if (unlikely(status != 0))

		goto out;

	p = read_buf(xdr, 4);
@@ -227,6 +233,11 @@ static __be32 decode_recall_args(struct svc_rqst *rqstp, struct xdr_stream *xdr, 
}



#if defined(CONFIG_NFS_V4_1)

static __be32 decode_layout_stateid(struct xdr_stream *xdr, nfs4_stateid *stateid)

{

	stateid->type = NFS4_LAYOUT_STATEID_TYPE;

	return decode_stateid(xdr, stateid);

}



static __be32 decode_layoutrecall_args(struct svc_rqst *rqstp,

				       struct xdr_stream *xdr,
@@ -263,7 +274,7 @@ static __be32 decode_layoutrecall_args(struct svc_rqst *rqstp, 
		}

		p = xdr_decode_hyper(p, &args->cbl_range.offset);

		p = xdr_decode_hyper(p, &args->cbl_range.length);

		status = decode_stateid(xdr, &args->cbl_stateid);

		status = decode_layout_stateid(xdr, &args->cbl_stateid);

		if (unlikely(status != 0))

			goto out;

	} else if (args->cbl_recall_type == RETURN_FSID) {

fs/nfs/delegation.c

+6 −3
Original line number Diff line number Diff line
@@ -875,15 +875,16 @@ int nfs_delegations_present(struct nfs_client *clp) 


/**

 * nfs4_copy_delegation_stateid - Copy inode's state ID information

 * @dst: stateid data structure to fill in

 * @inode: inode to check

 * @flags: delegation type requirement

 * @dst: stateid data structure to fill in

 * @cred: optional argument to retrieve credential

 *

 * Returns "true" and fills in "dst->data" * if inode had a delegation,

 * otherwise "false" is returned.

 */

bool nfs4_copy_delegation_stateid(nfs4_stateid *dst, struct inode *inode,

		fmode_t flags)

bool nfs4_copy_delegation_stateid(struct inode *inode, fmode_t flags,

		nfs4_stateid *dst, struct rpc_cred **cred)

{

	struct nfs_inode *nfsi = NFS_I(inode);

	struct nfs_delegation *delegation;
@@ -896,6 +897,8 @@ bool nfs4_copy_delegation_stateid(nfs4_stateid *dst, struct inode *inode, 
	if (ret) {

		nfs4_stateid_copy(dst, &delegation->stateid);

		nfs_mark_delegation_referenced(delegation);

		if (cred)

			*cred = get_rpccred(delegation->cred);

	}

	rcu_read_unlock();

	return ret;

fs/nfs/delegation.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ void nfs_delegation_reap_unclaimed(struct nfs_client *clp); 
int nfs4_proc_delegreturn(struct inode *inode, struct rpc_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(nfs4_stateid *dst, struct inode *inode, fmode_t flags);

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



void nfs_mark_delegation_referenced(struct nfs_delegation *delegation);

int nfs4_have_delegation(struct inode *inode, fmode_t flags);

fs/nfs/direct.c

+10 −7
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ struct nfs_direct_req { 
	int			mirror_count;



	ssize_t			count,		/* bytes actually processed */

				max_count,	/* max expected count */

				bytes_left,	/* bytes left to be sent */

				io_start,	/* start of IO */

				error;		/* any reported error */
@@ -123,6 +124,8 @@ nfs_direct_good_bytes(struct nfs_direct_req *dreq, struct nfs_pgio_header *hdr) 
	int i;

	ssize_t count;



	WARN_ON_ONCE(dreq->count >= dreq->max_count);



	if (dreq->mirror_count == 1) {

		dreq->mirrors[hdr->pgio_mirror_idx].count += hdr->good_bytes;

		dreq->count += hdr->good_bytes;
@@ -275,7 +278,7 @@ static void nfs_direct_release_pages(struct page **pages, unsigned int npages) 
void nfs_init_cinfo_from_dreq(struct nfs_commit_info *cinfo,

			      struct nfs_direct_req *dreq)

{

	cinfo->lock = &dreq->inode->i_lock;

	cinfo->inode = dreq->inode;

	cinfo->mds = &dreq->mds_cinfo;

	cinfo->ds = &dreq->ds_cinfo;

	cinfo->dreq = dreq;
@@ -591,7 +594,7 @@ ssize_t nfs_file_direct_read(struct kiocb *iocb, struct iov_iter *iter) 
		goto out_unlock;



	dreq->inode = inode;

	dreq->bytes_left = count;

	dreq->bytes_left = dreq->max_count = count;

	dreq->io_start = iocb->ki_pos;

	dreq->ctx = get_nfs_open_context(nfs_file_open_context(iocb->ki_filp));

	l_ctx = nfs_get_lock_context(dreq->ctx);
@@ -630,13 +633,13 @@ nfs_direct_write_scan_commit_list(struct inode *inode, 
				  struct list_head *list,

				  struct nfs_commit_info *cinfo)

{

	spin_lock(cinfo->lock);

	spin_lock(&cinfo->inode->i_lock);

#ifdef CONFIG_NFS_V4_1

	if (cinfo->ds != NULL && cinfo->ds->nwritten != 0)

		NFS_SERVER(inode)->pnfs_curr_ld->recover_commit_reqs(list, cinfo);

#endif

	nfs_scan_commit_list(&cinfo->mds->list, list, cinfo, 0);

	spin_unlock(cinfo->lock);

	spin_unlock(&cinfo->inode->i_lock);

}



static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq)
@@ -671,13 +674,13 @@ static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq) 
		if (!nfs_pageio_add_request(&desc, req)) {

			nfs_list_remove_request(req);

			nfs_list_add_request(req, &failed);

			spin_lock(cinfo.lock);

			spin_lock(&cinfo.inode->i_lock);

			dreq->flags = 0;

			if (desc.pg_error < 0)

				dreq->error = desc.pg_error;

			else

				dreq->error = -EIO;

			spin_unlock(cinfo.lock);

			spin_unlock(&cinfo.inode->i_lock);

		}

		nfs_release_request(req);

	}
@@ -1023,7 +1026,7 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter) 
		goto out_unlock;



	dreq->inode = inode;

	dreq->bytes_left = iov_iter_count(iter);

	dreq->bytes_left = dreq->max_count = iov_iter_count(iter);

	dreq->io_start = pos;

	dreq->ctx = get_nfs_open_context(nfs_file_open_context(iocb->ki_filp));

	l_ctx = nfs_get_lock_context(dreq->ctx);