Commit 101688f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfs-for-4.3-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

Pull NFS client bugfixes from Trond Myklebust:
 "Highlights include:

  Stable patches:
   - fix v4.2 SEEK on files over 2 gigs
   - Fix a layout segment reference leak when pNFS I/O falls back to inband I/O.
   - Fix recovery of recalled read delegations

  Bugfixes:
   - Fix a case where NFSv4 fails to send CLOSE after a server reboot
   - Fix sunrpc to wait for connections to complete before retrying
   - Fix sunrpc races between transport connect/disconnect and shutdown
   - Fix an infinite loop when layoutget fail with BAD_STATEID
   - nfs/filelayout: Fix NULL reference caused by double freeing of fh_array
   - Fix a bogus WARN_ON_ONCE() in O_DIRECT when layout commit_through_mds is set
   - Fix layoutreturn/close ordering issues"

* tag 'nfs-for-4.3-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFS41: make close wait for layoutreturn
  NFS: Skip checking ds_cinfo.buckets when lseg's commit_through_mds is set
  NFSv4.x/pnfs: Don't try to recover stateids twice in layoutget
  NFSv4: Recovery of recalled read delegations is broken
  NFS: Fix an infinite loop when layoutget fail with BAD_STATEID
  NFS: Do cleanup before resetting pageio read/write to mds
  SUNRPC: xs_sock_mark_closed() does not need to trigger socket autoclose
  SUNRPC: Lock the transport layer on shutdown
  nfs/filelayout: Fix NULL reference caused by double freeing of fh_array
  SUNRPC: Ensure that we wait for connections to complete before retrying
  SUNRPC: drop null test before destroy functions
  nfs: fix v4.2 SEEK on files over 2 gigs
  SUNRPC: Fix races between socket connection and destroy code
  nfs: fix pg_test page count calculation
  Failing to send a CLOSE if file is opened WRONLY and server reboots on a 4.x mount
parents ddff42e5 500d701f

fs/nfs/delegation.c

+5 −3
Original line number Diff line number Diff line
@@ -113,7 +113,8 @@ out: 
	return status;

}



static int nfs_delegation_claim_opens(struct inode *inode, const nfs4_stateid *stateid)

static int nfs_delegation_claim_opens(struct inode *inode,

		const nfs4_stateid *stateid, fmode_t type)

{

	struct nfs_inode *nfsi = NFS_I(inode);

	struct nfs_open_context *ctx;
@@ -140,7 +141,7 @@ again: 
		/* Block nfs4_proc_unlck */

		mutex_lock(&sp->so_delegreturn_mutex);

		seq = raw_seqcount_begin(&sp->so_reclaim_seqcount);

		err = nfs4_open_delegation_recall(ctx, state, stateid);

		err = nfs4_open_delegation_recall(ctx, state, stateid, type);

		if (!err)

			err = nfs_delegation_claim_locks(ctx, state, stateid);

		if (!err && read_seqcount_retry(&sp->so_reclaim_seqcount, seq))
@@ -411,7 +412,8 @@ static int nfs_end_delegation_return(struct inode *inode, struct nfs_delegation 
	do {

		if (test_bit(NFS_DELEGATION_REVOKED, &delegation->flags))

			break;

		err = nfs_delegation_claim_opens(inode, &delegation->stateid);

		err = nfs_delegation_claim_opens(inode, &delegation->stateid,

				delegation->type);

		if (!issync || err != -EAGAIN)

			break;

		/*

fs/nfs/delegation.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ void nfs_delegation_reap_unclaimed(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_open_delegation_recall(struct nfs_open_context *ctx, struct nfs4_state *state, const nfs4_stateid *stateid);

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);

fs/nfs/direct.c

+5 −2
Original line number Diff line number Diff line
@@ -166,8 +166,11 @@ nfs_direct_select_verf(struct nfs_direct_req *dreq, 
	struct nfs_writeverf *verfp = &dreq->verf;



#ifdef CONFIG_NFS_V4_1

	if (ds_clp) {

		/* pNFS is in use, use the DS verf */

	/*

	 * pNFS is in use, use the DS verf except commit_through_mds is set

	 * for layout segment where nbuckets is zero.

	 */

	if (ds_clp && dreq->ds_cinfo.nbuckets > 0) {

		if (commit_idx >= 0 && commit_idx < dreq->ds_cinfo.nbuckets)

			verfp = &dreq->ds_cinfo.buckets[commit_idx].direct_verf;

		else

fs/nfs/filelayout/filelayout.c

+12 −19
Original line number Diff line number Diff line
@@ -629,23 +629,18 @@ out_put: 
	goto out;

}



static void filelayout_free_fh_array(struct nfs4_filelayout_segment *fl)

static void _filelayout_free_lseg(struct nfs4_filelayout_segment *fl)

{

	int i;



	if (fl->fh_array) {

		for (i = 0; i < fl->num_fh; i++) {

			if (!fl->fh_array[i])

				break;

			kfree(fl->fh_array[i]);

		}

		kfree(fl->fh_array);

	fl->fh_array = NULL;

	}



static void

_filelayout_free_lseg(struct nfs4_filelayout_segment *fl)

{

	filelayout_free_fh_array(fl);

	kfree(fl);

}
@@ -716,21 +711,21 @@ filelayout_decode_layout(struct pnfs_layout_hdr *flo, 
		/* Do we want to use a mempool here? */

		fl->fh_array[i] = kmalloc(sizeof(struct nfs_fh), gfp_flags);

		if (!fl->fh_array[i])

			goto out_err_free;

			goto out_err;



		p = xdr_inline_decode(&stream, 4);

		if (unlikely(!p))

			goto out_err_free;

			goto out_err;

		fl->fh_array[i]->size = be32_to_cpup(p++);

		if (sizeof(struct nfs_fh) < fl->fh_array[i]->size) {

			printk(KERN_ERR "NFS: Too big fh %d received %d\n",

			       i, fl->fh_array[i]->size);

			goto out_err_free;

			goto out_err;

		}



		p = xdr_inline_decode(&stream, fl->fh_array[i]->size);

		if (unlikely(!p))

			goto out_err_free;

			goto out_err;

		memcpy(fl->fh_array[i]->data, p, fl->fh_array[i]->size);

		dprintk("DEBUG: %s: fh len %d\n", __func__,

			fl->fh_array[i]->size);
@@ -739,8 +734,6 @@ filelayout_decode_layout(struct pnfs_layout_hdr *flo, 
	__free_page(scratch);

	return 0;



out_err_free:

	filelayout_free_fh_array(fl);

out_err:

	__free_page(scratch);

	return -EIO;

fs/nfs/nfs42proc.c

+3 −1
Original line number Diff line number Diff line
@@ -175,10 +175,12 @@ loff_t nfs42_proc_llseek(struct file *filep, loff_t offset, int whence) 
{

	struct nfs_server *server = NFS_SERVER(file_inode(filep));

	struct nfs4_exception exception = { };

	int err;

	loff_t err;



	do {

		err = _nfs42_proc_llseek(filep, offset, whence);

		if (err >= 0)

			break;

		if (err == -ENOTSUPP)

			return -EOPNOTSUPP;

		err = nfs4_handle_exception(server, err, &exception);

CRA Git | Maintained and supported by SUSTech CRA and CCSE