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

Merge tag 'nfs-for-5.12-2' of git://git.linux-nfs.org/projects/anna/linux-nfs 

Pull NFS client bugfixes from Anna Schumaker:
 "These are mostly fixes for issues discovered at the recent NFS
  bakeathon:

   - Fix PNFS_FLEXFILE_LAYOUT kconfig so it is possible to build
     into the kernel

   - Correct size calculationn for create reply length

   - Set memalloc_nofs_save() for sync tasks to prevent deadlocks

   - Don't revalidate directory permissions on lookup failure

   - Don't clear inode cache when lookup fails

   - Change functions to use nfs_set_cache_invalid() for proper
     delegation handling

   - Fix return value of _nfs4_get_security_label()

   - Return an error when attempting to remove system.nfs4_acl"

* tag 'nfs-for-5.12-2' of git://git.linux-nfs.org/projects/anna/linux-nfs:
  nfs: we don't support removing system.nfs4_acl
  NFSv4.2: fix return value of _nfs4_get_security_label()
  NFS: Fix open coded versions of nfs_set_cache_invalid() in NFSv4
  NFS: Fix open coded versions of nfs_set_cache_invalid()
  NFS: Clean up function nfs_mark_dir_for_revalidate()
  NFS: Don't gratuitously clear the inode cache when lookup failed
  NFS: Don't revalidate the directory permissions on a lookup failure
  SUNRPC: Set memalloc_nofs_save() for sync tasks
  NFS: Correct size calculation for create reply length
  nfs: fix PNFS_FLEXFILE_LAYOUT Kconfig default
parents b6b8aa27 4f8be1f5

fs/nfs/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ config PNFS_BLOCK 
config PNFS_FLEXFILE_LAYOUT

	tristate

	depends on NFS_V4_1 && NFS_V3

	default m

	default NFS_V4



config NFS_V4_1_IMPLEMENTATION_ID_DOMAIN

	string "NFSv4.1 Implementation ID Domain"

fs/nfs/dir.c

+33 −25
Original line number Diff line number Diff line
@@ -81,8 +81,9 @@ static struct nfs_open_dir_context *alloc_nfs_open_dir_context(struct inode *dir 
		spin_lock(&dir->i_lock);

		if (list_empty(&nfsi->open_files) &&

		    (nfsi->cache_validity & NFS_INO_DATA_INVAL_DEFER))

			nfsi->cache_validity |= NFS_INO_INVALID_DATA |

				NFS_INO_REVAL_FORCED;

			nfs_set_cache_invalid(dir,

					      NFS_INO_INVALID_DATA |

						      NFS_INO_REVAL_FORCED);

		list_add(&ctx->list, &nfsi->open_files);

		spin_unlock(&dir->i_lock);

		return ctx;
@@ -1401,6 +1402,13 @@ int nfs_lookup_verify_inode(struct inode *inode, unsigned int flags) 
	goto out;

}



static void nfs_mark_dir_for_revalidate(struct inode *inode)

{

	spin_lock(&inode->i_lock);

	nfs_set_cache_invalid(inode, NFS_INO_REVAL_PAGECACHE);

	spin_unlock(&inode->i_lock);

}



/*

 * We judge how long we want to trust negative

 * dentries by looking at the parent inode mtime.
@@ -1435,19 +1443,14 @@ nfs_lookup_revalidate_done(struct inode *dir, struct dentry *dentry, 
			__func__, dentry);

		return 1;

	case 0:

		nfs_mark_for_revalidate(dir);

		if (inode && S_ISDIR(inode->i_mode)) {

			/* Purge readdir caches. */

			nfs_zap_caches(inode);

		/*

		 * We can't d_drop the root of a disconnected tree:

		 * its d_hash is on the s_anon list and d_drop() would hide

		 * it from shrink_dcache_for_unmount(), leading to busy

		 * inodes on unmount and further oopses.

		 */

			if (IS_ROOT(dentry))

		if (inode && IS_ROOT(dentry))

			return 1;

		}

		dfprintk(LOOKUPCACHE, "NFS: %s(%pd2) is invalid\n",

				__func__, dentry);

		return 0;
@@ -1525,6 +1528,13 @@ nfs_lookup_revalidate_dentry(struct inode *dir, struct dentry *dentry, 
	nfs_free_fattr(fattr);

	nfs_free_fhandle(fhandle);

	nfs4_label_free(label);



	/*

	 * If the lookup failed despite the dentry change attribute being

	 * a match, then we should revalidate the directory cache.

	 */

	if (!ret && nfs_verify_change_attribute(dir, dentry->d_time))

		nfs_mark_dir_for_revalidate(dir);

	return nfs_lookup_revalidate_done(dir, dentry, inode, ret);

}
@@ -1567,7 +1577,7 @@ nfs_do_lookup_revalidate(struct inode *dir, struct dentry *dentry, 
		error = nfs_lookup_verify_inode(inode, flags);

		if (error) {

			if (error == -ESTALE)

				nfs_zap_caches(dir);

				nfs_mark_dir_for_revalidate(dir);

			goto out_bad;

		}

		nfs_advise_use_readdirplus(dir);
@@ -1691,10 +1701,9 @@ static void nfs_drop_nlink(struct inode *inode) 
	if (inode->i_nlink > 0)

		drop_nlink(inode);

	NFS_I(inode)->attr_gencount = nfs_inc_attr_generation_counter();

	NFS_I(inode)->cache_validity |= NFS_INO_INVALID_CHANGE

		| NFS_INO_INVALID_CTIME

		| NFS_INO_INVALID_OTHER

		| NFS_INO_REVAL_FORCED;

	nfs_set_cache_invalid(

		inode, NFS_INO_INVALID_CHANGE | NFS_INO_INVALID_CTIME |

			       NFS_INO_INVALID_OTHER | NFS_INO_REVAL_FORCED);

	spin_unlock(&inode->i_lock);

}
@@ -1706,7 +1715,7 @@ static void nfs_dentry_iput(struct dentry *dentry, struct inode *inode) 
{

	if (S_ISDIR(inode->i_mode))

		/* drop any readdir cache as it could easily be old */

		NFS_I(inode)->cache_validity |= NFS_INO_INVALID_DATA;

		nfs_set_cache_invalid(inode, NFS_INO_INVALID_DATA);



	if (dentry->d_flags & DCACHE_NFSFS_RENAMED) {

		nfs_complete_unlink(dentry, inode);
@@ -2064,7 +2073,6 @@ nfs_add_or_obtain(struct dentry *dentry, struct nfs_fh *fhandle, 
	dput(parent);

	return d;

out_error:

	nfs_mark_for_revalidate(dir);

	d = ERR_PTR(error);

	goto out;

}
@@ -2473,9 +2481,9 @@ int nfs_rename(struct user_namespace *mnt_userns, struct inode *old_dir, 
	if (error == 0) {

		spin_lock(&old_inode->i_lock);

		NFS_I(old_inode)->attr_gencount = nfs_inc_attr_generation_counter();

		NFS_I(old_inode)->cache_validity |= NFS_INO_INVALID_CHANGE

			| NFS_INO_INVALID_CTIME

			| NFS_INO_REVAL_FORCED;

		nfs_set_cache_invalid(old_inode, NFS_INO_INVALID_CHANGE |

							 NFS_INO_INVALID_CTIME |

							 NFS_INO_REVAL_FORCED);

		spin_unlock(&old_inode->i_lock);

	}

out:

fs/nfs/inode.c

+4 −3
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static bool nfs_has_xattr_cache(const struct nfs_inode *nfsi) 
}

#endif



static void nfs_set_cache_invalid(struct inode *inode, unsigned long flags)

void nfs_set_cache_invalid(struct inode *inode, unsigned long flags)

{

	struct nfs_inode *nfsi = NFS_I(inode);

	bool have_delegation = NFS_PROTO(inode)->have_delegation(inode, FMODE_READ);
@@ -229,6 +229,7 @@ static void nfs_set_cache_invalid(struct inode *inode, unsigned long flags) 
	if (flags & NFS_INO_INVALID_DATA)

		nfs_fscache_invalidate(inode);

}

EXPORT_SYMBOL_GPL(nfs_set_cache_invalid);



/*

 * Invalidate the local caches
@@ -1067,8 +1068,8 @@ void nfs_inode_attach_open_context(struct nfs_open_context *ctx) 
	spin_lock(&inode->i_lock);

	if (list_empty(&nfsi->open_files) &&

	    (nfsi->cache_validity & NFS_INO_DATA_INVAL_DEFER))

		nfsi->cache_validity |= NFS_INO_INVALID_DATA |

			NFS_INO_REVAL_FORCED;

		nfs_set_cache_invalid(inode, NFS_INO_INVALID_DATA |

						     NFS_INO_REVAL_FORCED);

	list_add_tail_rcu(&ctx->list, &nfsi->open_files);

	spin_unlock(&inode->i_lock);

}

fs/nfs/internal.h

+2 −1
Original line number Diff line number Diff line
@@ -411,7 +411,8 @@ extern int nfs_write_inode(struct inode *, struct writeback_control *); 
extern int nfs_drop_inode(struct inode *);

extern void nfs_clear_inode(struct inode *);

extern void nfs_evict_inode(struct inode *);

void nfs_zap_acl_cache(struct inode *inode);

extern void nfs_zap_acl_cache(struct inode *inode);

extern void nfs_set_cache_invalid(struct inode *inode, unsigned long flags);

extern bool nfs_check_cache_invalid(struct inode *, unsigned long);

extern int nfs_wait_bit_killable(struct wait_bit_key *key, int mode);

extern int nfs_wait_atomic_killable(atomic_t *p, unsigned int mode);

fs/nfs/nfs3xdr.c

+2 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#define NFS3_pagepad_sz		(1) /* Page padding */

#define NFS3_fhandle_sz		(1+16)

#define NFS3_fh_sz		(NFS3_fhandle_sz)	/* shorthand */

#define NFS3_post_op_fh_sz	(1+NFS3_fh_sz)

#define NFS3_sattr_sz		(15)

#define NFS3_filename_sz	(1+(NFS3_MAXNAMLEN>>2))

#define NFS3_path_sz		(1+(NFS3_MAXPATHLEN>>2))
@@ -73,7 +74,7 @@ 
#define NFS3_readlinkres_sz	(1+NFS3_post_op_attr_sz+1+NFS3_pagepad_sz)

#define NFS3_readres_sz		(1+NFS3_post_op_attr_sz+3+NFS3_pagepad_sz)

#define NFS3_writeres_sz	(1+NFS3_wcc_data_sz+4)

#define NFS3_createres_sz	(1+NFS3_fh_sz+NFS3_post_op_attr_sz+NFS3_wcc_data_sz)

#define NFS3_createres_sz	(1+NFS3_post_op_fh_sz+NFS3_post_op_attr_sz+NFS3_wcc_data_sz)

#define NFS3_renameres_sz	(1+(2 * NFS3_wcc_data_sz))

#define NFS3_linkres_sz		(1+NFS3_post_op_attr_sz+NFS3_wcc_data_sz)

#define NFS3_readdirres_sz	(1+NFS3_post_op_attr_sz+2+NFS3_pagepad_sz)