Commit 965181d7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfs-for-5.18-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

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

  Features:

   - Switch NFS to use readahead instead of the obsolete readpages.

   - Readdir fixes to improve cacheability of large directories when
     there are multiple readers and writers.

   - Readdir performance improvements when doing a seekdir() immediately
     after opening the directory (common when re-exporting NFS).

   - NFS swap improvements from Neil Brown.

   - Loosen up memory allocation to permit direct reclaim and write back
     in cases where there is no danger of deadlocking the writeback code
     or NFS swap.

   - Avoid sillyrename when the NFSv4 server claims to support the
     necessary features to recover the unlinked but open file after
     reboot.

  Bugfixes:

   - Patch from Olga to add a mount option to control NFSv4.1 session
     trunking discovery, and default it to being off.

   - Fix a lockup in nfs_do_recoalesce().

   - Two fixes for list iterator variables being used when pointing to
     the list head.

   - Fix a kernel memory scribble when reading from a non-socket
     transport in /sys/kernel/sunrpc.

   - Fix a race where reconnecting to a server could leave the TCP
     socket stuck forever in the connecting state.

   - Patch from Neil to fix a shutdown race which can leave the SUNRPC
     transport timer primed after we free the struct xprt itself.

   - Patch from Xin Xiong to fix reference count leaks in the NFSv4.2
     copy offload.

   - Sunrpc patch from Olga to avoid resending a task on an offlined
     transport.

  Cleanups:

   - Patches from Dave Wysochanski to clean up the fscache code"

* tag 'nfs-for-5.18-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (91 commits)
  NFSv4/pNFS: Fix another issue with a list iterator pointing to the head
  NFS: Don't loop forever in nfs_do_recoalesce()
  SUNRPC: Don't return error values in sysfs read of closed files
  SUNRPC: Do not dereference non-socket transports in sysfs
  NFSv4.1: don't retry BIND_CONN_TO_SESSION on session error
  SUNRPC don't resend a task on an offlined transport
  NFS: replace usage of found with dedicated list iterator variable
  SUNRPC: avoid race between mod_timer() and del_timer_sync()
  pNFS/files: Ensure pNFS allocation modes are consistent with nfsiod
  pNFS/flexfiles: Ensure pNFS allocation modes are consistent with nfsiod
  NFSv4/pnfs: Ensure pNFS allocation modes are consistent with nfsiod
  NFS: Avoid writeback threads getting stuck in mempool_alloc()
  NFS: nfsiod should not block forever in mempool_alloc()
  SUNRPC: Make the rpciod and xprtiod slab allocation modes consistent
  SUNRPC: Fix unx_lookup_cred() allocation
  NFS: Fix memory allocation in rpc_alloc_task()
  NFS: Fix memory allocation in rpc_malloc()
  SUNRPC: Improve accuracy of socket ENOBUFS determination
  SUNRPC: Replace internal use of SOCKWQ_ASYNC_NOSPACE
  SUNRPC: Fix socket waits for write buffer space
  ...
parents 1ec48f95 7c9d845f

fs/nfs/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -4,6 +4,10 @@ config NFS_FS 
	depends on INET && FILE_LOCKING && MULTIUSER

	select LOCKD

	select SUNRPC

	select CRYPTO

	select CRYPTO_HASH

	select XXHASH

	select CRYPTO_XXHASH

	select NFS_ACL_SUPPORT if NFS_V3_ACL

	help

	  Choose Y here if you want to access files residing on other

fs/nfs/callback_proc.c

+10 −19
Original line number Diff line number Diff line
@@ -358,12 +358,11 @@ __be32 nfs4_callback_devicenotify(void *argp, void *resp, 
				  struct cb_process_state *cps)

{

	struct cb_devicenotifyargs *args = argp;

	const struct pnfs_layoutdriver_type *ld = NULL;

	uint32_t i;

	__be32 res = 0;

	struct nfs_client *clp = cps->clp;

	struct nfs_server *server = NULL;



	if (!clp) {

	if (!cps->clp) {

		res = cpu_to_be32(NFS4ERR_OP_NOT_IN_SESSION);

		goto out;

	}
@@ -371,23 +370,15 @@ __be32 nfs4_callback_devicenotify(void *argp, void *resp, 
	for (i = 0; i < args->ndevs; i++) {

		struct cb_devicenotifyitem *dev = &args->devs[i];



		if (!server ||

		    server->pnfs_curr_ld->id != dev->cbd_layout_type) {

			rcu_read_lock();

			list_for_each_entry_rcu(server, &clp->cl_superblocks, client_link)

				if (server->pnfs_curr_ld &&

				    server->pnfs_curr_ld->id == dev->cbd_layout_type) {

					rcu_read_unlock();

					goto found;

				}

			rcu_read_unlock();

		if (!ld || ld->id != dev->cbd_layout_type) {

			pnfs_put_layoutdriver(ld);

			ld = pnfs_find_layoutdriver(dev->cbd_layout_type);

			if (!ld)

				continue;

		}



	found:

		nfs4_delete_deviceid(server->pnfs_curr_ld, clp, &dev->cbd_dev_id);

		nfs4_delete_deviceid(ld, cps->clp, &dev->cbd_dev_id);

	}



	pnfs_put_layoutdriver(ld);

out:

	kfree(args->devs);

	return res;
@@ -710,7 +701,7 @@ __be32 nfs4_callback_offload(void *data, void *dummy, 
	struct nfs4_copy_state *copy, *tmp_copy;

	bool found = false;



	copy = kzalloc(sizeof(struct nfs4_copy_state), GFP_NOFS);

	copy = kzalloc(sizeof(struct nfs4_copy_state), GFP_KERNEL);

	if (!copy)

		return htonl(NFS4ERR_SERVERFAULT);

fs/nfs/callback_xdr.c

+0 −4
Original line number Diff line number Diff line
@@ -271,10 +271,6 @@ __be32 decode_devicenotify_args(struct svc_rqst *rqstp, 
	n = ntohl(*p++);

	if (n == 0)

		goto out;

	if (n > ULONG_MAX / sizeof(*args->devs)) {

		status = htonl(NFS4ERR_BADXDR);

		goto out;

	}



	args->devs = kmalloc_array(n, sizeof(*args->devs), GFP_KERNEL);

	if (!args->devs) {

fs/nfs/client.c

+2 −1
Original line number Diff line number Diff line
@@ -857,7 +857,8 @@ static int nfs_probe_fsinfo(struct nfs_server *server, struct nfs_fh *mntfh, str 
	}



	if (clp->rpc_ops->discover_trunking != NULL &&

			(server->caps & NFS_CAP_FS_LOCATIONS)) {

			(server->caps & NFS_CAP_FS_LOCATIONS &&

			 (server->flags & NFS_MOUNT_TRUNK_DISCOVERY))) {

		error = clp->rpc_ops->discover_trunking(server, mntfh);

		if (error < 0)

			return error;

fs/nfs/delegation.c

+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ int nfs_inode_set_delegation(struct inode *inode, const struct cred *cred, 
	struct nfs_delegation *freeme = NULL;

	int status = 0;



	delegation = kmalloc(sizeof(*delegation), GFP_NOFS);

	delegation = kmalloc(sizeof(*delegation), GFP_KERNEL_ACCOUNT);

	if (delegation == NULL)

		return -ENOMEM;

	nfs4_stateid_copy(&delegation->stateid, stateid);