Commit 4e99b321 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfs-for-5.8-2' of git://git.linux-nfs.org/projects/anna/linux-nfs 

Pull NFS client bugfixes from Anna Schumaker:
 "Stable Fixes:
   - xprtrdma: Fix handling of RDMA_ERROR replies
   - sunrpc: Fix rollback in rpc_gssd_dummy_populate()
   - pNFS/flexfiles: Fix list corruption if the mirror count changes
   - NFSv4: Fix CLOSE not waiting for direct IO completion
   - SUNRPC: Properly set the @subbuf parameter of xdr_buf_subsegment()

  Other Fixes:
   - xprtrdma: Fix a use-after-free with r_xprt->rx_ep
   - Fix other xprtrdma races during disconnect
   - NFS: Fix memory leak of export_path"

* tag 'nfs-for-5.8-2' of git://git.linux-nfs.org/projects/anna/linux-nfs:
  SUNRPC: Properly set the @subbuf parameter of xdr_buf_subsegment()
  NFSv4 fix CLOSE not waiting for direct IO compeletion
  pNFS/flexfiles: Fix list corruption if the mirror count changes
  nfs: Fix memory leak of export_path
  sunrpc: fixed rollback in rpc_gssd_dummy_populate()
  xprtrdma: Fix handling of RDMA_ERROR replies
  xprtrdma: Clean up disconnect
  xprtrdma: Clean up synopsis of rpcrdma_flush_disconnect()
  xprtrdma: Use re_connect_status safely in rpcrdma_xprt_connect()
  xprtrdma: Prevent dereferencing r_xprt->rx_ep after it is freed
parents ab0f2473 89a3c9f5

fs/nfs/direct.c

+9 −4
Original line number Diff line number Diff line
@@ -267,8 +267,6 @@ static void nfs_direct_complete(struct nfs_direct_req *dreq) 
{

	struct inode *inode = dreq->inode;



	inode_dio_end(inode);



	if (dreq->iocb) {

		long res = (long) dreq->error;

		if (dreq->count != 0) {
@@ -280,7 +278,10 @@ static void nfs_direct_complete(struct nfs_direct_req *dreq) 


	complete(&dreq->completion);



	igrab(inode);

	nfs_direct_req_release(dreq);

	inode_dio_end(inode);

	iput(inode);

}



static void nfs_direct_read_completion(struct nfs_pgio_header *hdr)
@@ -410,8 +411,10 @@ static ssize_t nfs_direct_read_schedule_iovec(struct nfs_direct_req *dreq, 
	 * generic layer handle the completion.

	 */

	if (requested_bytes == 0) {

		inode_dio_end(inode);

		igrab(inode);

		nfs_direct_req_release(dreq);

		inode_dio_end(inode);

		iput(inode);

		return result < 0 ? result : -EIO;

	}
@@ -864,8 +867,10 @@ static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq, 
	 * generic layer handle the completion.

	 */

	if (requested_bytes == 0) {

		inode_dio_end(inode);

		igrab(inode);

		nfs_direct_req_release(dreq);

		inode_dio_end(inode);

		iput(inode);

		return result < 0 ? result : -EIO;

	}

fs/nfs/file.c

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ nfs_file_release(struct inode *inode, struct file *filp) 
	dprintk("NFS: release(%pD2)\n", filp);



	nfs_inc_stats(inode, NFSIOS_VFSRELEASE);

	inode_dio_wait(inode);

	nfs_file_clear_open_context(filp);

	return 0;

}

fs/nfs/flexfilelayout/flexfilelayout.c

+7 −4
Original line number Diff line number Diff line
@@ -907,9 +907,8 @@ retry: 
		goto out_mds;



	/* Use a direct mapping of ds_idx to pgio mirror_idx */

	if (WARN_ON_ONCE(pgio->pg_mirror_count !=

	    FF_LAYOUT_MIRROR_COUNT(pgio->pg_lseg)))

		goto out_mds;

	if (pgio->pg_mirror_count != FF_LAYOUT_MIRROR_COUNT(pgio->pg_lseg))

		goto out_eagain;



	for (i = 0; i < pgio->pg_mirror_count; i++) {

		mirror = FF_LAYOUT_COMP(pgio->pg_lseg, i);
@@ -931,7 +930,10 @@ retry: 
			(NFS_MOUNT_SOFT|NFS_MOUNT_SOFTERR))

		pgio->pg_maxretrans = io_maxretrans;

	return;



out_eagain:

	pnfs_generic_pg_cleanup(pgio);

	pgio->pg_error = -EAGAIN;

	return;

out_mds:

	trace_pnfs_mds_fallback_pg_init_write(pgio->pg_inode,

			0, NFS4_MAX_UINT64, IOMODE_RW,
@@ -941,6 +943,7 @@ out_mds: 
	pgio->pg_lseg = NULL;

	pgio->pg_maxretrans = 0;

	nfs_pageio_reset_write_mds(pgio);

	pgio->pg_error = -EAGAIN;

}



static unsigned int

fs/nfs/nfs4namespace.c

+1 −0
Original line number Diff line number Diff line
@@ -308,6 +308,7 @@ static int try_location(struct fs_context *fc, 
	if (IS_ERR(export_path))

		return PTR_ERR(export_path);



	kfree(ctx->nfs_server.export_path);

	ctx->nfs_server.export_path = export_path;



	source = kmalloc(len + 1 + ctx->nfs_server.export_path_len + 1,

net/sunrpc/rpc_pipe.c

+1 −0
Original line number Diff line number Diff line
@@ -1317,6 +1317,7 @@ rpc_gssd_dummy_populate(struct dentry *root, struct rpc_pipe *pipe_data) 
	q.len = strlen(gssd_dummy_clnt_dir[0].name);

	clnt_dentry = d_hash_and_lookup(gssd_dentry, &q);

	if (!clnt_dentry) {

		__rpc_depopulate(gssd_dentry, gssd_dummy_clnt_dir, 0, 1);

		pipe_dentry = ERR_PTR(-ENOENT);

		goto out;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE