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

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

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

  Stable fixes:

   - NFSv42: Fix pagecache invalidation after COPY/CLONE

  Bugfixes:

   - NFSv42: Don't fail clone() just because the server failed to return
     post-op attributes

   - SUNRPC: use different lockdep keys for INET6 and LOCAL

   - NFSv4.1: handle NFS4ERR_NOSPC from CREATE_SESSION

   - SUNRPC: fix header include guard in trace header"

* tag 'nfs-for-5.16-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  SUNRPC: use different lock keys for INET6 and LOCAL
  sunrpc: fix header include guard in trace header
  NFSv4.1: handle NFS4ERR_NOSPC by CREATE_SESSION
  NFSv42: Fix pagecache invalidation after COPY/CLONE
  NFS: Add a tracepoint to show the results of nfs_set_cache_invalid()
  NFSv42: Don't fail clone() unless the OP_CLONE operation failed
parents 52dc4c64 064a9177

fs/nfs/inode.c

+1 −0
Original line number Diff line number Diff line
@@ -219,6 +219,7 @@ void nfs_set_cache_invalid(struct inode *inode, unsigned long flags) 
					  NFS_INO_DATA_INVAL_DEFER);

	else if (nfsi->cache_validity & NFS_INO_INVALID_DATA)

		nfsi->cache_validity &= ~NFS_INO_DATA_INVAL_DEFER;

	trace_nfs_set_cache_invalid(inode, 0);

}

EXPORT_SYMBOL_GPL(nfs_set_cache_invalid);

fs/nfs/nfs42proc.c

+3 −1
Original line number Diff line number Diff line
@@ -289,7 +289,9 @@ static void nfs42_copy_dest_done(struct inode *inode, loff_t pos, loff_t len) 
	loff_t newsize = pos + len;

	loff_t end = newsize - 1;



	truncate_pagecache_range(inode, pos, end);

	WARN_ON_ONCE(invalidate_inode_pages2_range(inode->i_mapping,

				pos >> PAGE_SHIFT, end >> PAGE_SHIFT));



	spin_lock(&inode->i_lock);

	if (newsize > i_size_read(inode))

		i_size_write(inode, newsize);

fs/nfs/nfs42xdr.c

+1 −2
Original line number Diff line number Diff line
@@ -1434,8 +1434,7 @@ static int nfs4_xdr_dec_clone(struct rpc_rqst *rqstp, 
	status = decode_clone(xdr);

	if (status)

		goto out;

	status = decode_getfattr(xdr, res->dst_fattr, res->server);



	decode_getfattr(xdr, res->dst_fattr, res->server);

out:

	res->rpc_status = status;

	return status;

fs/nfs/nfs4state.c

+4 −0
Original line number Diff line number Diff line
@@ -1998,6 +1998,10 @@ static int nfs4_handle_reclaim_lease_error(struct nfs_client *clp, int status) 
		dprintk("%s: exit with error %d for server %s\n",

				__func__, -EPROTONOSUPPORT, clp->cl_hostname);

		return -EPROTONOSUPPORT;

	case -ENOSPC:

		if (clp->cl_cons_state == NFS_CS_SESSION_INITING)

			nfs_mark_client_ready(clp, -EIO);

		return -EIO;

	case -NFS4ERR_NOT_SAME: /* FixMe: implement recovery

				 * in nfs4_exchange_id */

	default:

fs/nfs/nfstrace.h

+1 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ DEFINE_NFS_INODE_EVENT_DONE(nfs_writeback_inode_exit); 
DEFINE_NFS_INODE_EVENT(nfs_fsync_enter);

DEFINE_NFS_INODE_EVENT_DONE(nfs_fsync_exit);

DEFINE_NFS_INODE_EVENT(nfs_access_enter);

DEFINE_NFS_INODE_EVENT_DONE(nfs_set_cache_invalid);



TRACE_EVENT(nfs_access_exit,

		TP_PROTO(