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

Merge tag 'nfs-for-5.8-1' of git://git.linux-nfs.org/projects/anna/linux-nfs 

Pull NFS client updates from Anna Schumaker:
 "New features and improvements:
   - Sunrpc receive buffer sizes only change when establishing a GSS credentials
   - Add more sunrpc tracepoints
   - Improve on tracepoints to capture internal NFS I/O errors

  Other bugfixes and cleanups:
   - Move a dprintk() to after a call to nfs_alloc_fattr()
   - Fix off-by-one issues in rpc_ntop6
   - Fix a few coccicheck warnings
   - Use the correct SPDX license identifiers
   - Fix rpc_call_done assignment for BIND_CONN_TO_SESSION
   - Replace zero-length array with flexible array
   - Remove duplicate headers
   - Set invalid blocks after NFSv4 writes to update space_used attribute
   - Fix direct WRITE throughput regression"

* tag 'nfs-for-5.8-1' of git://git.linux-nfs.org/projects/anna/linux-nfs: (27 commits)
  NFS: Fix direct WRITE throughput regression
  SUNRPC: rpc_xprt lifetime events should record xprt->state
  xprtrdma: Make xprt_rdma_slot_table_entries static
  nfs: set invalid blocks after NFSv4 writes
  NFS: remove redundant initialization of variable result
  sunrpc: add missing newline when printing parameter 'auth_hashtable_size' by sysfs
  NFS: Add a tracepoint in nfs_set_pgio_error()
  NFS: Trace short NFS READs
  NFS: nfs_xdr_status should record the procedure name
  SUNRPC: Set SOFTCONN when destroying GSS contexts
  SUNRPC: rpc_call_null_helper() should set RPC_TASK_SOFT
  SUNRPC: rpc_call_null_helper() already sets RPC_TASK_NULLCREDS
  SUNRPC: trace RPC client lifetime events
  SUNRPC: Trace transport lifetime events
  SUNRPC: Split the xdr_buf event class
  SUNRPC: Add tracepoint to rpc_call_rpcerror()
  SUNRPC: Update the RPC_SHOW_SOCKET() macro
  SUNRPC: Update the rpc_show_task_flags() macro
  SUNRPC: Trace GSS context lifetimes
  SUNRPC: receive buffer size estimation values almost never change
  ...
parents e8de4575 ba838a75

fs/nfs/direct.c

+3 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ ssize_t nfs_file_direct_read(struct kiocb *iocb, struct iov_iter *iter) 
	struct inode *inode = mapping->host;

	struct nfs_direct_req *dreq;

	struct nfs_lock_context *l_ctx;

	ssize_t result = -EINVAL, requested;

	ssize_t result, requested;

	size_t count = iov_iter_count(iter);

	nfs_add_stats(mapping->host, NFSIOS_DIRECTREADBYTES, count);
@@ -731,6 +731,8 @@ static void nfs_direct_write_completion(struct nfs_pgio_header *hdr) 
		nfs_list_remove_request(req);

		if (request_commit) {

			kref_get(&req->wb_kref);

			memcpy(&req->wb_verf, &hdr->verf.verifier,

			       sizeof(req->wb_verf));

			nfs_mark_request_commit(req, hdr->lseg, &cinfo,

				hdr->ds_commit_idx);

		}

fs/nfs/dns_resolve.c

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ ssize_t nfs_dns_resolve_name(struct net *net, char *name, size_t namelen, 
#include <linux/string.h>

#include <linux/kmod.h>

#include <linux/slab.h>

#include <linux/module.h>

#include <linux/socket.h>

#include <linux/seq_file.h>

#include <linux/inet.h>

fs/nfs/inode.c

+11 −3
Original line number Diff line number Diff line
@@ -833,6 +833,8 @@ int nfs_getattr(const struct path *path, struct kstat *stat, 
		do_update |= cache_validity & NFS_INO_INVALID_ATIME;

	if (request_mask & (STATX_CTIME|STATX_MTIME))

		do_update |= cache_validity & NFS_INO_REVAL_PAGECACHE;

	if (request_mask & STATX_BLOCKS)

		do_update |= cache_validity & NFS_INO_INVALID_BLOCKS;

	if (do_update) {

		/* Update the attribute cache */

		if (!(server->flags & NFS_MOUNT_NOAC))
@@ -1764,7 +1766,8 @@ out_noforce: 
	status = nfs_post_op_update_inode_locked(inode, fattr,

			NFS_INO_INVALID_CHANGE

			| NFS_INO_INVALID_CTIME

			| NFS_INO_INVALID_MTIME);

			| NFS_INO_INVALID_MTIME

			| NFS_INO_INVALID_BLOCKS);

	return status;

}
@@ -1871,7 +1874,8 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
	nfsi->cache_validity &= ~(NFS_INO_INVALID_ATTR

			| NFS_INO_INVALID_ATIME

			| NFS_INO_REVAL_FORCED

			| NFS_INO_REVAL_PAGECACHE);

			| NFS_INO_REVAL_PAGECACHE

			| NFS_INO_INVALID_BLOCKS);



	/* Do atomic weak cache consistency updates */

	nfs_wcc_update_inode(inode, fattr);
@@ -2033,8 +2037,12 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr) 
		inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used);

	} else if (fattr->valid & NFS_ATTR_FATTR_BLOCKS_USED)

		inode->i_blocks = fattr->du.nfs2.blocks;

	else

	else {

		nfsi->cache_validity |= save_cache_validity &

				(NFS_INO_INVALID_BLOCKS

				| NFS_INO_REVAL_FORCED);

		cache_revalidated = false;

	}



	/* Update attrtimeo value if we're out of the unstable period */

	if (attr_changed) {

fs/nfs/nfs3proc.c

+1 −1
Original line number Diff line number Diff line
@@ -179,11 +179,11 @@ nfs3_proc_lookup(struct inode *dir, struct dentry *dentry, 
	if (nfs_lookup_is_soft_revalidate(dentry))

		task_flags |= RPC_TASK_TIMEOUT;



	dprintk("NFS call  lookup %pd2\n", dentry);

	res.dir_attr = nfs_alloc_fattr();

	if (res.dir_attr == NULL)

		return -ENOMEM;



	dprintk("NFS call  lookup %pd2\n", dentry);

	nfs_fattr_init(fattr);

	status = rpc_call_sync(NFS_CLIENT(dir), &msg, task_flags);

	nfs_refresh_inode(dir, res.dir_attr);

fs/nfs/nfs4proc.c

+1 −1
Original line number Diff line number Diff line
@@ -7909,7 +7909,7 @@ nfs4_bind_one_conn_to_session_done(struct rpc_task *task, void *calldata) 
}



static const struct rpc_call_ops nfs4_bind_one_conn_to_session_ops = {

	.rpc_call_done =  &nfs4_bind_one_conn_to_session_done,

	.rpc_call_done =  nfs4_bind_one_conn_to_session_done,

};



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE