Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 972a2bf7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull NFS client updates from Anna Schumaker:
 "Stable bugfixes:
   - Dequeue the request from the receive queue while we're re-encoding
     # v4.20+
   - Fix buffer handling of GSS MIC without slack # 5.1

  Features:
   - Increase xprtrdma maximum transport header and slot table sizes
   - Add support for nfs4_call_sync() calls using a custom
     rpc_task_struct
   - Optimize the default readahead size
   - Enable pNFS filelayout LAYOUTGET on OPEN

  Other bugfixes and cleanups:
   - Fix possible null-pointer dereferences and memory leaks
   - Various NFS over RDMA cleanups
   - Various NFS over RDMA comment updates
   - Don't receive TCP data into a reset request buffer
   - Don't try to parse incomplete RPC messages
   - Fix congestion window race with disconnect
   - Clean up pNFS return-on-close error handling
   - Fixes for NFS4ERR_OLD_STATEID handling"

* tag 'nfs-for-5.4-1' of git://git.linux-nfs.org/projects/anna/linux-nfs: (53 commits)
  pNFS/filelayout: enable LAYOUTGET on OPEN
  NFS: Optimise the default readahead size
  NFSv4: Handle NFS4ERR_OLD_STATEID in LOCKU
  NFSv4: Handle NFS4ERR_OLD_STATEID in CLOSE/OPEN_DOWNGRADE
  NFSv4: Fix OPEN_DOWNGRADE error handling
  pNFS: Handle NFS4ERR_OLD_STATEID on layoutreturn by bumping the state seqid
  NFSv4: Add a helper to increment stateid seqids
  NFSv4: Handle RPC level errors in LAYOUTRETURN
  NFSv4: Handle NFS4ERR_DELAY correctly in return-on-close
  NFSv4: Clean up pNFS return-on-close error handling
  pNFS: Ensure we do clear the return-on-close layout stateid on fatal errors
  NFS: remove unused check for negative dentry
  NFSv3: use nfs_add_or_obtain() to create and reference inodes
  NFS: Refactor nfs_instantiate() for dentry referencing callers
  SUNRPC: Fix congestion window race with disconnect
  SUNRPC: Don't try to parse incomplete RPC messages
  SUNRPC: Rename xdr_buf_read_netobj to xdr_buf_read_mic
  SUNRPC: Fix buffer handling of GSS MIC without slack
  SUNRPC: RPC level errors should always set task->tk_rpc_status
  SUNRPC: Don't receive TCP data into a request buffer that has been reset
  ...
parents 7be3cb01 a8fd0fee

fs/nfs/dir.c

+25 −16
Original line number Diff line number Diff line
@@ -1669,10 +1669,8 @@ static int nfs4_lookup_revalidate(struct dentry *dentry, unsigned int flags) 


#endif /* CONFIG_NFSV4 */



/*

 * Code common to create, mkdir, and mknod.

 */

int nfs_instantiate(struct dentry *dentry, struct nfs_fh *fhandle,

struct dentry *

nfs_add_or_obtain(struct dentry *dentry, struct nfs_fh *fhandle,

				struct nfs_fattr *fattr,

				struct nfs4_label *label)

{
@@ -1680,13 +1678,10 @@ int nfs_instantiate(struct dentry *dentry, struct nfs_fh *fhandle, 
	struct inode *dir = d_inode(parent);

	struct inode *inode;

	struct dentry *d;

	int error = -EACCES;

	int error;



	d_drop(dentry);



	/* We may have been initialized further down */

	if (d_really_is_positive(dentry))

		goto out;

	if (fhandle->size == 0) {

		error = NFS_PROTO(dir)->lookup(dir, &dentry->d_name, fhandle, fattr, NULL);

		if (error)
@@ -1702,18 +1697,32 @@ int nfs_instantiate(struct dentry *dentry, struct nfs_fh *fhandle, 
	}

	inode = nfs_fhget(dentry->d_sb, fhandle, fattr, label);

	d = d_splice_alias(inode, dentry);

	if (IS_ERR(d)) {

		error = PTR_ERR(d);

		goto out_error;

	}

	dput(d);

out:

	dput(parent);

	return 0;

	return d;

out_error:

	nfs_mark_for_revalidate(dir);

	dput(parent);

	return error;

	d = ERR_PTR(error);

	goto out;

}

EXPORT_SYMBOL_GPL(nfs_add_or_obtain);



/*

 * Code common to create, mkdir, and mknod.

 */

int nfs_instantiate(struct dentry *dentry, struct nfs_fh *fhandle,

				struct nfs_fattr *fattr,

				struct nfs4_label *label)

{

	struct dentry *d;



	d = nfs_add_or_obtain(dentry, fhandle, fattr, label);

	if (IS_ERR(d))

		return PTR_ERR(d);



	/* Callers don't care */

	dput(d);

	return 0;

}

EXPORT_SYMBOL_GPL(nfs_instantiate);

fs/nfs/filelayout/filelayout.c

+1 −0
Original line number Diff line number Diff line
@@ -1164,6 +1164,7 @@ static struct pnfs_layoutdriver_type filelayout_type = { 
	.id			= LAYOUT_NFSV4_1_FILES,

	.name			= "LAYOUT_NFSV4_1_FILES",

	.owner			= THIS_MODULE,

	.flags			= PNFS_LAYOUTGET_ON_OPEN,

	.max_layoutget_response	= 4096, /* 1 page or so... */

	.alloc_layout_hdr	= filelayout_alloc_layout_hdr,

	.free_layout_hdr	= filelayout_free_layout_hdr,

fs/nfs/internal.h

+0 −8
Original line number Diff line number Diff line
@@ -16,14 +16,6 @@ extern const struct export_operations nfs_export_ops; 


struct nfs_string;



/* Maximum number of readahead requests

 * FIXME: this should really be a sysctl so that users may tune it to suit

 *        their needs. People that do NFS over a slow network, might for

 *        instance want to reduce it to something closer to 1 for improved

 *        interactive response.

 */

#define NFS_MAX_READAHEAD	(RPC_DEF_SLOT_TABLE - 1)



static inline void nfs_attr_check_mountpoint(struct super_block *parent, struct nfs_fattr *fattr)

{

	if (!nfs_fsid_equal(&NFS_SB(parent)->fsid, &fattr->fsid))

fs/nfs/nfs3proc.c

+36 −9
Original line number Diff line number Diff line
@@ -279,15 +279,17 @@ static struct nfs3_createdata *nfs3_alloc_createdata(void) 
	return data;

}



static int nfs3_do_create(struct inode *dir, struct dentry *dentry, struct nfs3_createdata *data)

static struct dentry *

nfs3_do_create(struct inode *dir, struct dentry *dentry, struct nfs3_createdata *data)

{

	int status;



	status = rpc_call_sync(NFS_CLIENT(dir), &data->msg, 0);

	nfs_post_op_update_inode(dir, data->res.dir_attr);

	if (status == 0)

		status = nfs_instantiate(dentry, data->res.fh, data->res.fattr, NULL);

	return status;

	if (status != 0)

		return ERR_PTR(status);



	return nfs_add_or_obtain(dentry, data->res.fh, data->res.fattr, NULL);

}



static void nfs3_free_createdata(struct nfs3_createdata *data)
@@ -304,6 +306,7 @@ nfs3_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr, 
{

	struct posix_acl *default_acl, *acl;

	struct nfs3_createdata *data;

	struct dentry *d_alias;

	int status = -ENOMEM;



	dprintk("NFS call  create %pd\n", dentry);
@@ -330,7 +333,8 @@ nfs3_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr, 
		goto out;



	for (;;) {

		status = nfs3_do_create(dir, dentry, data);

		d_alias = nfs3_do_create(dir, dentry, data);

		status = PTR_ERR_OR_ZERO(d_alias);



		if (status != -ENOTSUPP)

			break;
@@ -355,6 +359,9 @@ nfs3_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr, 
	if (status != 0)

		goto out_release_acls;



	if (d_alias)

		dentry = d_alias;



	/* When we created the file with exclusive semantics, make

	 * sure we set the attributes afterwards. */

	if (data->arg.create.createmode == NFS3_CREATE_EXCLUSIVE) {
@@ -372,11 +379,13 @@ nfs3_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr, 
		nfs_post_op_update_inode(d_inode(dentry), data->res.fattr);

		dprintk("NFS reply setattr (post-create): %d\n", status);

		if (status != 0)

			goto out_release_acls;

			goto out_dput;

	}



	status = nfs3_proc_setacls(d_inode(dentry), acl, default_acl);



out_dput:

	dput(d_alias);

out_release_acls:

	posix_acl_release(acl);

	posix_acl_release(default_acl);
@@ -504,6 +513,7 @@ nfs3_proc_symlink(struct inode *dir, struct dentry *dentry, struct page *page, 
		  unsigned int len, struct iattr *sattr)

{

	struct nfs3_createdata *data;

	struct dentry *d_alias;

	int status = -ENOMEM;



	if (len > NFS3_MAXPATHLEN)
@@ -522,7 +532,11 @@ nfs3_proc_symlink(struct inode *dir, struct dentry *dentry, struct page *page, 
	data->arg.symlink.pathlen = len;

	data->arg.symlink.sattr = sattr;



	status = nfs3_do_create(dir, dentry, data);

	d_alias = nfs3_do_create(dir, dentry, data);

	status = PTR_ERR_OR_ZERO(d_alias);



	if (status == 0)

		dput(d_alias);



	nfs3_free_createdata(data);

out:
@@ -535,6 +549,7 @@ nfs3_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr) 
{

	struct posix_acl *default_acl, *acl;

	struct nfs3_createdata *data;

	struct dentry *d_alias;

	int status = -ENOMEM;



	dprintk("NFS call  mkdir %pd\n", dentry);
@@ -553,12 +568,18 @@ nfs3_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr) 
	data->arg.mkdir.len = dentry->d_name.len;

	data->arg.mkdir.sattr = sattr;



	status = nfs3_do_create(dir, dentry, data);

	d_alias = nfs3_do_create(dir, dentry, data);

	status = PTR_ERR_OR_ZERO(d_alias);



	if (status != 0)

		goto out_release_acls;



	if (d_alias)

		dentry = d_alias;



	status = nfs3_proc_setacls(d_inode(dentry), acl, default_acl);



	dput(d_alias);

out_release_acls:

	posix_acl_release(acl);

	posix_acl_release(default_acl);
@@ -660,6 +681,7 @@ nfs3_proc_mknod(struct inode *dir, struct dentry *dentry, struct iattr *sattr, 
{

	struct posix_acl *default_acl, *acl;

	struct nfs3_createdata *data;

	struct dentry *d_alias;

	int status = -ENOMEM;



	dprintk("NFS call  mknod %pd %u:%u\n", dentry,
@@ -698,12 +720,17 @@ nfs3_proc_mknod(struct inode *dir, struct dentry *dentry, struct iattr *sattr, 
		goto out;

	}



	status = nfs3_do_create(dir, dentry, data);

	d_alias = nfs3_do_create(dir, dentry, data);

	status = PTR_ERR_OR_ZERO(d_alias);

	if (status != 0)

		goto out_release_acls;



	if (d_alias)

		dentry = d_alias;



	status = nfs3_proc_setacls(d_inode(dentry), acl, default_acl);



	dput(d_alias);

out_release_acls:

	posix_acl_release(acl);

	posix_acl_release(default_acl);

fs/nfs/nfs4_fs.h

+9 −2
Original line number Diff line number Diff line
@@ -491,8 +491,6 @@ extern int nfs4_set_lock_state(struct nfs4_state *state, struct file_lock *fl); 
extern int nfs4_select_rw_stateid(struct nfs4_state *, fmode_t,

		const struct nfs_lock_context *, nfs4_stateid *,

		const struct cred **);

extern bool nfs4_refresh_open_stateid(nfs4_stateid *dst,

		struct nfs4_state *state);

extern bool nfs4_copy_open_stateid(nfs4_stateid *dst,

		struct nfs4_state *state);
@@ -574,6 +572,15 @@ static inline bool nfs4_stateid_is_newer(const nfs4_stateid *s1, const nfs4_stat 
	return (s32)(be32_to_cpu(s1->seqid) - be32_to_cpu(s2->seqid)) > 0;

}



static inline void nfs4_stateid_seqid_inc(nfs4_stateid *s1)

{

	u32 seqid = be32_to_cpu(s1->seqid);



	if (++seqid == 0)

		++seqid;

	s1->seqid = cpu_to_be32(seqid);

}



static inline bool nfs4_valid_open_stateid(const struct nfs4_state *state)

{

	return test_bit(NFS_STATE_RECOVERY_FAILED, &state->flags) == 0;