Commit 37711e5e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull NFS client updates from Trond Myklebust:
 "Stable fixes:
   - pNFS: Don't return layout segments that are being used for I/O
   - pNFS: Don't move layout segments off the active list when being used for I/O

  Features:
   - NFS: Add support for user xattrs through the NFSv4.2 protocol
   - NFS: Allow applications to speed up readdir+statx() using AT_STATX_DONT_SYNC
   - NFSv4.0 allow nconnect for v4.0

  Bugfixes and cleanups:
   - nfs: ensure correct writeback errors are returned on close()
   - nfs: nfs_file_write() should check for writeback errors
   - nfs: Fix getxattr kernel panic and memory overflow
   - NFS: Fix the pNFS/flexfiles mirrored read failover code
   - SUNRPC: dont update timeout value on connection reset
   - freezer: Add unsafe versions of freezable_schedule_timeout_interruptible for NFS
   - sunrpc: destroy rpc_inode_cachep after unregister_filesystem"

* tag 'nfs-for-5.9-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (32 commits)
  NFS: Fix flexfiles read failover
  fs: nfs: delete repeated words in comments
  rpc_pipefs: convert comma to semicolon
  nfs: Fix getxattr kernel panic and memory overflow
  NFS: Don't return layout segments that are in use
  NFS: Don't move layouts to plh_return_segs list while in use
  NFS: Add layout segment info to pnfs read/write/commit tracepoints
  NFS: Add tracepoints for layouterror and layoutstats.
  NFS: Report the stateid + status in trace_nfs4_layoutreturn_on_close()
  SUNRPC dont update timeout value on connection reset
  nfs: nfs_file_write() should check for writeback errors
  nfs: ensure correct writeback errors are returned on close()
  NFSv4.2: xattr cache: get rid of cache discard work queue
  NFS: remove redundant initialization of variable result
  NFSv4.0 allow nconnect for v4.0
  freezer: Add unsafe versions of freezable_schedule_timeout_interruptible for NFS
  sunrpc: destroy rpc_inode_cachep after unregister_filesystem
  NFSv4.2: add client side xattr caching.
  NFSv4.2: hook in the user extended attribute handlers
  NFSv4.2: add the extended attribute proc functions.
  ...
parents 6ffdcde4 563c53e7

fs/nfs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ nfsv4-y := nfs4proc.o nfs4xdr.o nfs4state.o nfs4renewd.o nfs4super.o nfs4file.o 
nfsv4-$(CONFIG_NFS_USE_LEGACY_DNS) += cache_lib.o

nfsv4-$(CONFIG_SYSCTL)	+= nfs4sysctl.o

nfsv4-$(CONFIG_NFS_V4_1)	+= pnfs.o pnfs_dev.o pnfs_nfs.o

nfsv4-$(CONFIG_NFS_V4_2)	+= nfs42proc.o

nfsv4-$(CONFIG_NFS_V4_2)	+= nfs42proc.o nfs42xattr.o



obj-$(CONFIG_PNFS_FILE_LAYOUT) += filelayout/

obj-$(CONFIG_PNFS_BLOCK) += blocklayout/

fs/nfs/blocklayout/rpc_pipefs.c

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ bl_resolve_deviceid(struct nfs_server *server, struct pnfs_block_volume *b, 
		goto out_free_data;



	bl_msg = msg->data;

	bl_msg->type = BL_DEVICE_MOUNT,

	bl_msg->type = BL_DEVICE_MOUNT;

	bl_msg->totallen = b->simple.len;

	nfs4_encode_simple(msg->data + sizeof(*bl_msg), b);

fs/nfs/client.c

+20 −2
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include "nfs.h"

#include "netns.h"

#include "sysfs.h"

#include "nfs42.h"



#define NFSDBG_FACILITY		NFSDBG_CLIENT
@@ -749,7 +750,7 @@ error: 
static void nfs_server_set_fsinfo(struct nfs_server *server,

				  struct nfs_fsinfo *fsinfo)

{

	unsigned long max_rpc_payload;

	unsigned long max_rpc_payload, raw_max_rpc_payload;



	/* Work out a lot of parameters */

	if (server->rsize == 0)
@@ -762,7 +763,9 @@ static void nfs_server_set_fsinfo(struct nfs_server *server, 
	if (fsinfo->wtmax >= 512 && server->wsize > fsinfo->wtmax)

		server->wsize = nfs_block_size(fsinfo->wtmax, NULL);



	max_rpc_payload = nfs_block_size(rpc_max_payload(server->client), NULL);

	raw_max_rpc_payload = rpc_max_payload(server->client);

	max_rpc_payload = nfs_block_size(raw_max_rpc_payload, NULL);



	if (server->rsize > max_rpc_payload)

		server->rsize = max_rpc_payload;

	if (server->rsize > NFS_MAX_FILE_IO_SIZE)
@@ -795,6 +798,21 @@ static void nfs_server_set_fsinfo(struct nfs_server *server, 
	server->clone_blksize = fsinfo->clone_blksize;

	/* We're airborne Set socket buffersize */

	rpc_setbufsize(server->client, server->wsize + 100, server->rsize + 100);



#ifdef CONFIG_NFS_V4_2

	/*

	 * Defaults until limited by the session parameters.

	 */

	server->gxasize = min_t(unsigned int, raw_max_rpc_payload,

				XATTR_SIZE_MAX);

	server->sxasize = min_t(unsigned int, raw_max_rpc_payload,

				XATTR_SIZE_MAX);

	server->lxasize = min_t(unsigned int, raw_max_rpc_payload,

				nfs42_listxattr_xdrsize(XATTR_LIST_MAX));



	if (fsinfo->xattr_support)

		server->caps |= NFS_CAP_XATTR;

#endif

}



/*

fs/nfs/dir.c

+20 −4
Original line number Diff line number Diff line
@@ -2460,7 +2460,7 @@ static struct nfs_access_entry *nfs_access_search_rbtree(struct inode *inode, co 
	return NULL;

}



static int nfs_access_get_cached(struct inode *inode, const struct cred *cred, struct nfs_access_entry *res, bool may_block)

static int nfs_access_get_cached_locked(struct inode *inode, const struct cred *cred, struct nfs_access_entry *res, bool may_block)

{

	struct nfs_inode *nfsi = NFS_I(inode);

	struct nfs_access_entry *cache;
@@ -2533,6 +2533,20 @@ out: 
	return err;

}



int nfs_access_get_cached(struct inode *inode, const struct cred *cred, struct

nfs_access_entry *res, bool may_block)

{

	int status;



	status = nfs_access_get_cached_rcu(inode, cred, res);

	if (status != 0)

		status = nfs_access_get_cached_locked(inode, cred, res,

		    may_block);



	return status;

}

EXPORT_SYMBOL_GPL(nfs_access_get_cached);



static void nfs_access_add_rbtree(struct inode *inode, struct nfs_access_entry *set)

{

	struct nfs_inode *nfsi = NFS_I(inode);
@@ -2647,8 +2661,6 @@ static int nfs_do_access(struct inode *inode, const struct cred *cred, int mask) 


	trace_nfs_access_enter(inode);



	status = nfs_access_get_cached_rcu(inode, cred, &cache);

	if (status != 0)

	status = nfs_access_get_cached(inode, cred, &cache, may_block);

	if (status == 0)

		goto out_cached;
@@ -2661,6 +2673,10 @@ static int nfs_do_access(struct inode *inode, const struct cred *cred, int mask) 
	 * Determine which access bits we want to ask for...

	 */

	cache.mask = NFS_ACCESS_READ | NFS_ACCESS_MODIFY | NFS_ACCESS_EXTEND;

	if (nfs_server_capable(inode, NFS_CAP_XATTR)) {

		cache.mask |= NFS_ACCESS_XAREAD | NFS_ACCESS_XAWRITE |

		    NFS_ACCESS_XALIST;

	}

	if (S_ISDIR(inode->i_mode))

		cache.mask |= NFS_ACCESS_DELETE | NFS_ACCESS_LOOKUP;

	else

fs/nfs/direct.c

+1 −1
Original line number Diff line number Diff line
@@ -896,7 +896,7 @@ static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq, 
 */

ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter)

{

	ssize_t result = -EINVAL, requested;

	ssize_t result, requested;

	size_t count;

	struct file *file = iocb->ki_filp;

	struct address_space *mapping = file->f_mapping;

CRA Git | Maintained and supported by SUSTech CRA and CCSE