Commit 2ec20f48 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

  Features:
   - NFSv4.1 can always retrieve and cache the ACCESS mode on OPEN
   - Optimisations for READDIR and the 'ls -l' style workload
   - Further replacements of dprintk() with tracepoints and other
     tracing improvements
   - Ensure we re-probe NFSv4 server capabilities when the user does a
     "mount -o remount"

  Bugfixes:
   - Fix an Oops in pnfs_mark_request_commit()
   - Fix up deadlocks in the commit code
   - Fix regressions in NFSv2/v3 attribute revalidation due to the
     change_attr_type optimisations
   - Fix some dentry verifier races
   - Fix some missing dentry verifier settings
   - Fix a performance regression in nfs_set_open_stateid_locked()
   - SUNRPC was sending multiple SYN calls when re-establishing a TCP
     connection.
   - Fix multiple NFSv4 issues due to missing sanity checking of server
     return values
   - Fix a potential Oops when FREE_STATEID races with an unmount

  Cleanups:
   - Clean up the labelled NFS code
   - Remove unused header <linux/pnfs_osd_xdr.h>"

* tag 'nfs-for-5.16-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (84 commits)
  NFSv4: Sanity check the parameters in nfs41_update_target_slotid()
  NFS: Remove the nfs4_label argument from decode_getattr_*() functions
  NFS: Remove the nfs4_label argument from nfs_setsecurity
  NFS: Remove the nfs4_label argument from nfs_fhget()
  NFS: Remove the nfs4_label argument from nfs_add_or_obtain()
  NFS: Remove the nfs4_label argument from nfs_instantiate()
  NFS: Remove the nfs4_label from the nfs_setattrres
  NFS: Remove the nfs4_label from the nfs4_getattr_res
  NFS: Remove the f_label from the nfs4_opendata and nfs_openres
  NFS: Remove the nfs4_label from the nfs4_lookupp_res struct
  NFS: Remove the label from the nfs4_lookup_res struct
  NFS: Remove the nfs4_label from the nfs4_link_res struct
  NFS: Remove the nfs4_label from the nfs4_create_res struct
  NFS: Remove the nfs4_label from the nfs_entry struct
  NFS: Create a new nfs_alloc_fattr_with_label() function
  NFS: Always initialise fattr->label in nfs_fattr_alloc()
  NFSv4.2: alloc_file_pseudo() takes an open flag, not an f_mode
  NFS: Don't allocate nfs_fattr on the stack in __nfs42_ssc_open()
  NFSv4: Remove unnecessary 'minor version' check
  NFSv4: Fix potential Oops in decode_op_map()
  ...
parents 5147da90 f96f8cc4

fs/lockd/clntproc.c

+0 −3
Original line number Diff line number Diff line
@@ -794,9 +794,6 @@ static void nlmclnt_cancel_callback(struct rpc_task *task, void *data) 
		goto retry_cancel;

	}



	dprintk("lockd: cancel status %u (task %u)\n",

			status, task->tk_pid);



	switch (status) {

	case NLM_LCK_GRANTED:

	case NLM_LCK_DENIED_GRACE_PERIOD:

fs/lockd/svc4proc.c

+0 −2
Original line number Diff line number Diff line
@@ -269,8 +269,6 @@ nlm4svc_proc_granted(struct svc_rqst *rqstp) 
 */

static void nlm4svc_callback_exit(struct rpc_task *task, void *data)

{

	dprintk("lockd: %5u callback returned %d\n", task->tk_pid,

			-task->tk_status);

}



static void nlm4svc_callback_release(void *data)

fs/lockd/svcproc.c

+0 −2
Original line number Diff line number Diff line
@@ -301,8 +301,6 @@ nlmsvc_proc_granted(struct svc_rqst *rqstp) 
 */

static void nlmsvc_callback_exit(struct rpc_task *task, void *data)

{

	dprintk("lockd: %5u callback returned %d\n", task->tk_pid,

			-task->tk_status);

}



void nlmsvc_release_call(struct nlm_rqst *call)

fs/nfs/callback_proc.c

+3 −0
Original line number Diff line number Diff line
@@ -739,6 +739,9 @@ __be32 nfs4_callback_offload(void *data, void *dummy, 
		kfree(copy);

	spin_unlock(&cps->clp->cl_lock);



	trace_nfs4_cb_offload(&args->coa_fh, &args->coa_stateid,

			args->wr_count, args->error,

			args->wr_writeverf.committed);

	return 0;

}

#endif /* CONFIG_NFS_V4_2 */

fs/nfs/client.c

+27 −12
Original line number Diff line number Diff line
@@ -828,7 +828,7 @@ static void nfs_server_set_fsinfo(struct nfs_server *server, 
/*

 * Probe filesystem information, including the FSID on v2/v3

 */

int nfs_probe_fsinfo(struct nfs_server *server, struct nfs_fh *mntfh, struct nfs_fattr *fattr)

static int nfs_probe_fsinfo(struct nfs_server *server, struct nfs_fh *mntfh, struct nfs_fattr *fattr)

{

	struct nfs_fsinfo fsinfo;

	struct nfs_client *clp = server->nfs_client;
@@ -862,7 +862,30 @@ int nfs_probe_fsinfo(struct nfs_server *server, struct nfs_fh *mntfh, struct nfs 


	return 0;

}

EXPORT_SYMBOL_GPL(nfs_probe_fsinfo);



/*

 * Grab the destination's particulars, including lease expiry time.

 *

 * Returns zero if probe succeeded and retrieved FSID matches the FSID

 * we have cached.

 */

int nfs_probe_server(struct nfs_server *server, struct nfs_fh *mntfh)

{

	struct nfs_fattr *fattr;

	int error;



	fattr = nfs_alloc_fattr();

	if (fattr == NULL)

		return -ENOMEM;



	/* Sanity: the probe won't work if the destination server

	 * does not recognize the migrated FH. */

	error = nfs_probe_fsinfo(server, mntfh, fattr);



	nfs_free_fattr(fattr);

	return error;

}

EXPORT_SYMBOL_GPL(nfs_probe_server);



/*

 * Copy useful information when duplicating a server record
@@ -1025,7 +1048,7 @@ struct nfs_server *nfs_create_server(struct fs_context *fc) 


	if (!(fattr->valid & NFS_ATTR_FATTR)) {

		error = ctx->nfs_mod->rpc_ops->getattr(server, ctx->mntfh,

						       fattr, NULL, NULL);

						       fattr, NULL);

		if (error < 0) {

			dprintk("nfs_create_server: getattr error = %d\n", -error);

			goto error;
@@ -1058,7 +1081,6 @@ struct nfs_server *nfs_clone_server(struct nfs_server *source, 
				    rpc_authflavor_t flavor)

{

	struct nfs_server *server;

	struct nfs_fattr *fattr_fsinfo;

	int error;



	server = nfs_alloc_server();
@@ -1067,11 +1089,6 @@ struct nfs_server *nfs_clone_server(struct nfs_server *source, 


	server->cred = get_cred(source->cred);



	error = -ENOMEM;

	fattr_fsinfo = nfs_alloc_fattr();

	if (fattr_fsinfo == NULL)

		goto out_free_server;



	/* Copy data from the source */

	server->nfs_client = source->nfs_client;

	server->destroy = source->destroy;
@@ -1087,7 +1104,7 @@ struct nfs_server *nfs_clone_server(struct nfs_server *source, 
		goto out_free_server;



	/* probe the filesystem info for this server filesystem */

	error = nfs_probe_fsinfo(server, fh, fattr_fsinfo);

	error = nfs_probe_server(server, fh);

	if (error < 0)

		goto out_free_server;
@@ -1101,11 +1118,9 @@ struct nfs_server *nfs_clone_server(struct nfs_server *source, 
	nfs_server_insert_lists(server);

	server->mount_time = jiffies;



	nfs_free_fattr(fattr_fsinfo);

	return server;



out_free_server:

	nfs_free_fattr(fattr_fsinfo);

	nfs_free_server(server);

	return ERR_PTR(error);

}