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

Merge tag 'nfs-for-5.1-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

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

  Stable fix:

   - Fix a deadlock in close() due to incorrect draining of RDMA queues

  Bugfixes:

   - Revert "SUNRPC: Micro-optimise when the task is known not to be
     sleeping" as it is causing stack overflows

   - Fix a regression where NFSv4 getacl and fs_locations stopped
     working

   - Forbid setting AF_INET6 to "struct sockaddr_in"->sin_family.

   - Fix xfstests failures due to incorrect copy_file_range() return
     values"

* tag 'nfs-for-5.1-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  Revert "SUNRPC: Micro-optimise when the task is known not to be sleeping"
  NFSv4.1 fix incorrect return value in copy_file_range
  xprtrdma: Fix helper that drains the transport
  NFS: Fix handling of reply page vector
  NFS: Forbid setting AF_INET6 to "struct sockaddr_in"->sin_family.
parents 87af0c38 af6b61d7

fs/nfs/nfs42proc.c

+0 −3
Original line number Diff line number Diff line
@@ -329,9 +329,6 @@ ssize_t nfs42_proc_copy(struct file *src, loff_t pos_src, 
	};

	ssize_t err, err2;



	if (!nfs_server_capable(file_inode(dst), NFS_CAP_COPY))

		return -EOPNOTSUPP;



	src_lock = nfs_get_lock_context(nfs_file_open_context(src));

	if (IS_ERR(src_lock))

		return PTR_ERR(src_lock);

fs/nfs/nfs4file.c

+3 −1
Original line number Diff line number Diff line
@@ -133,8 +133,10 @@ static ssize_t nfs4_copy_file_range(struct file *file_in, loff_t pos_in, 
				    struct file *file_out, loff_t pos_out,

				    size_t count, unsigned int flags)

{

	if (!nfs_server_capable(file_inode(file_out), NFS_CAP_COPY))

		return -EOPNOTSUPP;

	if (file_inode(file_in) == file_inode(file_out))

		return -EINVAL;

		return -EOPNOTSUPP;

	return nfs42_proc_copy(file_in, pos_in, file_out, pos_out, count);

}

fs/nfs/nfs4xdr.c

+2 −2
Original line number Diff line number Diff line
@@ -2589,7 +2589,7 @@ static void nfs4_xdr_enc_getacl(struct rpc_rqst *req, struct xdr_stream *xdr, 
			ARRAY_SIZE(nfs4_acl_bitmap), &hdr);



	rpc_prepare_reply_pages(req, args->acl_pages, 0,

				args->acl_len, replen);

				args->acl_len, replen + 1);

	encode_nops(&hdr);

}
@@ -2811,7 +2811,7 @@ static void nfs4_xdr_enc_fs_locations(struct rpc_rqst *req, 
	}



	rpc_prepare_reply_pages(req, (struct page **)&args->page, 0,

				PAGE_SIZE, replen);

				PAGE_SIZE, replen + 1);

	encode_nops(&hdr);

}

fs/nfs/super.c

+2 −1
Original line number Diff line number Diff line
@@ -2041,7 +2041,8 @@ static int nfs23_validate_mount_data(void *options, 
		memcpy(sap, &data->addr, sizeof(data->addr));

		args->nfs_server.addrlen = sizeof(data->addr);

		args->nfs_server.port = ntohs(data->addr.sin_port);

		if (!nfs_verify_server_address(sap))

		if (sap->sa_family != AF_INET ||

		    !nfs_verify_server_address(sap))

			goto out_no_address;



		if (!(data->flags & NFS_MOUNT_TCP))

include/linux/sunrpc/sched.h

+0 −8
Original line number Diff line number Diff line
@@ -304,12 +304,4 @@ rpc_clnt_swap_deactivate(struct rpc_clnt *clnt) 
}

#endif /* CONFIG_SUNRPC_SWAP */



static inline bool

rpc_task_need_resched(const struct rpc_task *task)

{

	if (RPC_IS_QUEUED(task) || task->tk_callback)

		return true;

	return false;

}



#endif /* _LINUX_SUNRPC_SCHED_H_ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE