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

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

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

  Features:

   - NFSv4.2 now supports cross device offloaded copy (i.e. offloaded
     copy of a file from one source server to a different target
     server).

   - New RDMA tracepoints for debugging congestion control and Local
     Invalidate WRs.

  Bugfixes and cleanups

   - Drop the NFSv4.1 session slot if nfs4_delegreturn_prepare waits for
     layoutreturn

   - Handle bad/dead sessions correctly in nfs41_sequence_process()

   - Various bugfixes to the delegation return operation.

   - Various bugfixes pertaining to delegations that have been revoked.

   - Cleanups to the NFS timespec code to avoid unnecessary conversions
     between timespec and timespec64.

   - Fix unstable RDMA connections after a reconnect

   - Close race between waking an RDMA sender and posting a receive

   - Wake pending RDMA tasks if connection fails

   - Fix MR list corruption, and clean up MR usage

   - Fix another RPCSEC_GSS issue with MIC buffer space"

* tag 'nfs-for-5.5-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (79 commits)
  SUNRPC: Capture completion of all RPC tasks
  SUNRPC: Fix another issue with MIC buffer space
  NFS4: Trace lock reclaims
  NFS4: Trace state recovery operation
  NFSv4.2 fix memory leak in nfs42_ssc_open
  NFSv4.2 fix kfree in __nfs42_copy_file_range
  NFS: remove duplicated include from nfs4file.c
  NFSv4: Make _nfs42_proc_copy_notify() static
  NFS: Fallocate should use the nfs4_fattr_bitmap
  NFS: Return -ETXTBSY when attempting to write to a swapfile
  fs: nfs: sysfs: Remove NULL check before kfree
  NFS: remove unneeded semicolon
  NFSv4: add declaration of current_stateid
  NFSv4.x: Drop the slot if nfs4_delegreturn_prepare waits for layoutreturn
  NFSv4.x: Handle bad/dead sessions correctly in nfs41_sequence_process()
  nfsv4: Move NFSPROC4_CLNT_COPY_NOTIFY to end of list
  SUNRPC: Avoid RPC delays when exiting suspend
  NFS: Add a tracepoint in nfs_fh_to_dentry()
  NFSv4: Don't retry the GETATTR on old stateid in nfs4_delegreturn_done()
  NFSv4: Handle NFS4ERR_OLD_STATEID in delegreturn
  ...
parents 94e89b40 a264abad

fs/lockd/host.c

+2 −1
Original line number Diff line number Diff line
@@ -464,7 +464,8 @@ nlm_bind_host(struct nlm_host *host) 
			.version	= host->h_version,

			.authflavor	= RPC_AUTH_UNIX,

			.flags		= (RPC_CLNT_CREATE_NOPING |

					   RPC_CLNT_CREATE_AUTOBIND),

					   RPC_CLNT_CREATE_AUTOBIND |

					   RPC_CLNT_CREATE_REUSEPORT),

			.cred		= host->h_cred,

		};

fs/nfs/callback.h

+2 −2
Original line number Diff line number Diff line
@@ -72,8 +72,8 @@ struct cb_getattrres { 
	uint32_t bitmap[2];

	uint64_t size;

	uint64_t change_attr;

	struct timespec ctime;

	struct timespec mtime;

	struct timespec64 ctime;

	struct timespec64 mtime;

};



struct cb_recallargs {

fs/nfs/callback_proc.c

+3 −5
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ __be32 nfs4_callback_getattr(void *argp, void *resp, 
	struct cb_getattrargs *args = argp;

	struct cb_getattrres *res = resp;

	struct nfs_delegation *delegation;

	struct nfs_inode *nfsi;

	struct inode *inode;



	res->status = htonl(NFS4ERR_OP_NOT_IN_SESSION);
@@ -47,17 +46,16 @@ __be32 nfs4_callback_getattr(void *argp, void *resp, 
				-ntohl(res->status));

		goto out;

	}

	nfsi = NFS_I(inode);

	rcu_read_lock();

	delegation = rcu_dereference(nfsi->delegation);

	delegation = nfs4_get_valid_delegation(inode);

	if (delegation == NULL || (delegation->type & FMODE_WRITE) == 0)

		goto out_iput;

	res->size = i_size_read(inode);

	res->change_attr = delegation->change_attr;

	if (nfs_have_writebacks(inode))

		res->change_attr++;

	res->ctime = timespec64_to_timespec(inode->i_ctime);

	res->mtime = timespec64_to_timespec(inode->i_mtime);

	res->ctime = inode->i_ctime;

	res->mtime = inode->i_mtime;

	res->bitmap[0] = (FATTR4_WORD0_CHANGE|FATTR4_WORD0_SIZE) &

		args->bitmap[0];

	res->bitmap[1] = (FATTR4_WORD1_TIME_METADATA|FATTR4_WORD1_TIME_MODIFY) &

fs/nfs/callback_xdr.c

+3 −3
Original line number Diff line number Diff line
@@ -627,7 +627,7 @@ static __be32 encode_attr_size(struct xdr_stream *xdr, const uint32_t *bitmap, u 
	return 0;

}



static __be32 encode_attr_time(struct xdr_stream *xdr, const struct timespec *time)

static __be32 encode_attr_time(struct xdr_stream *xdr, const struct timespec64 *time)

{

	__be32 *p;
@@ -639,14 +639,14 @@ static __be32 encode_attr_time(struct xdr_stream *xdr, const struct timespec *ti 
	return 0;

}



static __be32 encode_attr_ctime(struct xdr_stream *xdr, const uint32_t *bitmap, const struct timespec *time)

static __be32 encode_attr_ctime(struct xdr_stream *xdr, const uint32_t *bitmap, const struct timespec64 *time)

{

	if (!(bitmap[1] & FATTR4_WORD1_TIME_METADATA))

		return 0;

	return encode_attr_time(xdr,time);

}



static __be32 encode_attr_mtime(struct xdr_stream *xdr, const uint32_t *bitmap, const struct timespec *time)

static __be32 encode_attr_mtime(struct xdr_stream *xdr, const uint32_t *bitmap, const struct timespec64 *time)

{

	if (!(bitmap[1] & FATTR4_WORD1_TIME_MODIFY))

		return 0;

fs/nfs/client.c

+11 −0
Original line number Diff line number Diff line
@@ -312,6 +312,12 @@ again: 
		/* Match nfsv4 minorversion */

		if (clp->cl_minorversion != data->minorversion)

			continue;



		/* Match request for a dedicated DS */

		if (test_bit(NFS_CS_DS, &data->init_flags) !=

		    test_bit(NFS_CS_DS, &clp->cl_flags))

			continue;



		/* Match the full socket address */

		if (!rpc_cmp_addr_port(sap, clap))

			/* Match all xprt_switch full socket addresses */
@@ -515,6 +521,10 @@ int nfs_create_rpc_client(struct nfs_client *clp, 
		args.flags |= RPC_CLNT_CREATE_NONPRIVPORT;

	if (test_bit(NFS_CS_INFINITE_SLOTS, &clp->cl_flags))

		args.flags |= RPC_CLNT_CREATE_INFINITE_SLOTS;

	if (test_bit(NFS_CS_NOPING, &clp->cl_flags))

		args.flags |= RPC_CLNT_CREATE_NOPING;

	if (test_bit(NFS_CS_REUSEPORT, &clp->cl_flags))

		args.flags |= RPC_CLNT_CREATE_REUSEPORT;



	if (!IS_ERR(clp->cl_rpcclient))

		return 0;
@@ -662,6 +672,7 @@ static int nfs_init_server(struct nfs_server *server, 
		.timeparms = &timeparms,

		.cred = server->cred,

		.nconnect = data->nfs_server.nconnect,

		.init_flags = (1UL << NFS_CS_REUSEPORT),

	};

	struct nfs_client *clp;

	int error;

CRA Git | Maintained and supported by SUSTech CRA and CCSE