Commit 125f42b0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

   - Fix a typo in commit e0926934 ("NFS append COMMIT after
     synchronous COPY") that breaks copy offload

   - Fix the connect error propagation in xs_tcp_setup_socket()

   - Fix a lock leak in nfs40_walk_client_list

   - Verify that pNFS requests lie within the offset range of the layout
     segment"

* tag 'nfs-for-4.12-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  nfs: Mark unnecessarily extern functions as static
  SUNRPC: ensure correct error is reported by xs_tcp_setup_socket()
  NFSv4.0: Fix a lock leak in nfs40_walk_client_list
  pnfs: Fix the check for requests in range of layout segment
  xprtrdma: Delete an error message for a failed memory allocation in xprt_rdma_bc_setup()
  pNFS/flexfiles: missing error code in ff_layout_alloc_lseg()
  NFS fix COMMIT after COPY
parents 3c06e6cb 4f253e1e

fs/nfs/flexfilelayout/flexfilelayout.c

+1 −0
Original line number Diff line number Diff line
@@ -454,6 +454,7 @@ ff_layout_alloc_lseg(struct pnfs_layout_hdr *lh, 
			goto out_err_free;



		/* fh */

		rc = -EIO;

		p = xdr_inline_decode(&stream, 4);

		if (!p)

			goto out_err_free;

fs/nfs/internal.h

+0 −2
Original line number Diff line number Diff line
@@ -398,7 +398,6 @@ extern struct file_system_type nfs4_referral_fs_type; 
bool nfs_auth_info_match(const struct nfs_auth_info *, rpc_authflavor_t);

struct dentry *nfs_try_mount(int, const char *, struct nfs_mount_info *,

			struct nfs_subversion *);

void nfs_initialise_sb(struct super_block *);

int nfs_set_sb_security(struct super_block *, struct dentry *, struct nfs_mount_info *);

int nfs_clone_sb_security(struct super_block *, struct dentry *, struct nfs_mount_info *);

struct dentry *nfs_fs_mount_common(struct nfs_server *, int, const char *,
@@ -458,7 +457,6 @@ extern void nfs_read_prepare(struct rpc_task *task, void *calldata); 
extern void nfs_pageio_reset_read_mds(struct nfs_pageio_descriptor *pgio);



/* super.c */

void nfs_clone_super(struct super_block *, struct nfs_mount_info *);

void nfs_umount_begin(struct super_block *);

int  nfs_statfs(struct dentry *, struct kstatfs *);

int  nfs_show_options(struct seq_file *, struct dentry *);

fs/nfs/nfs42proc.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static ssize_t _nfs42_proc_copy(struct file *src, 
	if (status)

		goto out;



	if (!nfs_write_verifier_cmp(&res->write_res.verifier.verifier,

	if (nfs_write_verifier_cmp(&res->write_res.verifier.verifier,

				    &res->commit_res.verf->verifier)) {

		status = -EAGAIN;

		goto out;

fs/nfs/nfs4client.c

+0 −1
Original line number Diff line number Diff line
@@ -582,7 +582,6 @@ int nfs40_walk_client_list(struct nfs_client *new, 
			 */

			nfs4_schedule_path_down_recovery(pos);

		default:

			spin_lock(&nn->nfs_client_lock);

			goto out;

		}

fs/nfs/pnfs.c

+17 −8
Original line number Diff line number Diff line
@@ -2094,12 +2094,26 @@ pnfs_generic_pg_check_layout(struct nfs_pageio_descriptor *pgio) 
}

EXPORT_SYMBOL_GPL(pnfs_generic_pg_check_layout);



/*

 * Check for any intersection between the request and the pgio->pg_lseg,

 * and if none, put this pgio->pg_lseg away.

 */

static void

pnfs_generic_pg_check_range(struct nfs_pageio_descriptor *pgio, struct nfs_page *req)

{

	if (pgio->pg_lseg && !pnfs_lseg_request_intersecting(pgio->pg_lseg, req)) {

		pnfs_put_lseg(pgio->pg_lseg);

		pgio->pg_lseg = NULL;

	}

}



void

pnfs_generic_pg_init_read(struct nfs_pageio_descriptor *pgio, struct nfs_page *req)

{

	u64 rd_size = req->wb_bytes;



	pnfs_generic_pg_check_layout(pgio);

	pnfs_generic_pg_check_range(pgio, req);

	if (pgio->pg_lseg == NULL) {

		if (pgio->pg_dreq == NULL)

			rd_size = i_size_read(pgio->pg_inode) - req_offset(req);
@@ -2131,6 +2145,7 @@ pnfs_generic_pg_init_write(struct nfs_pageio_descriptor *pgio, 
			   struct nfs_page *req, u64 wb_size)

{

	pnfs_generic_pg_check_layout(pgio);

	pnfs_generic_pg_check_range(pgio, req);

	if (pgio->pg_lseg == NULL) {

		pgio->pg_lseg = pnfs_update_layout(pgio->pg_inode,

						   req->wb_context,
@@ -2191,16 +2206,10 @@ pnfs_generic_pg_test(struct nfs_pageio_descriptor *pgio, 
		seg_end = pnfs_end_offset(pgio->pg_lseg->pls_range.offset,

				     pgio->pg_lseg->pls_range.length);

		req_start = req_offset(req);

		WARN_ON_ONCE(req_start >= seg_end);



		/* start of request is past the last byte of this segment */

		if (req_start >= seg_end) {

			/* reference the new lseg */

			if (pgio->pg_ops->pg_cleanup)

				pgio->pg_ops->pg_cleanup(pgio);

			if (pgio->pg_ops->pg_init)

				pgio->pg_ops->pg_init(pgio, req);

		if (req_start >= seg_end)

			return 0;

		}



		/* adjust 'size' iff there are fewer bytes left in the

		 * segment than what nfs_generic_pg_test returned */

CRA Git | Maintained and supported by SUSTech CRA and CCSE