nfsd: allow reaping files still under writeback
[ Upstream commit dcb779fcd4ed5984ad15991d574943d12a8693d1 ] On most filesystems, there is no reason to delay reaping an nfsd_file just because its underlying inode is still under writeback. nfsd just relies on client activity or the local flusher threads to do writeback. The main exception is NFS, which flushes all of its dirty data on last close. Add a new EXPORT_OP_FLUSH_ON_CLOSE flag to allow filesystems to signal that they do this, and only skip closing files under writeback on such filesystems. Also, remove a redundant NULL file pointer check in nfsd_file_check_writeback, and clean up nfs's export op flag definitions. Signed-off-by: Jeff Layton <jlayton@kernel.org> Acked-by: Anna Schumaker <Anna.Schumaker@Netapp.com> [ cel: adjusted to apply to v5.10.y ] Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
1dd7dbd153
commit
c28473c81d
3 changed files with 18 additions and 4 deletions
|
@ -182,7 +182,10 @@ const struct export_operations nfs_export_ops = {
|
|||
.fh_to_dentry = nfs_fh_to_dentry,
|
||||
.get_parent = nfs_get_parent,
|
||||
.fetch_iversion = nfs_fetch_iversion,
|
||||
.flags = EXPORT_OP_NOWCC|EXPORT_OP_NOSUBTREECHK|
|
||||
EXPORT_OP_CLOSE_BEFORE_UNLINK|EXPORT_OP_REMOTE_FS|
|
||||
EXPORT_OP_NOATOMIC_ATTR,
|
||||
.flags = EXPORT_OP_NOWCC |
|
||||
EXPORT_OP_NOSUBTREECHK |
|
||||
EXPORT_OP_CLOSE_BEFORE_UNLINK |
|
||||
EXPORT_OP_REMOTE_FS |
|
||||
EXPORT_OP_NOATOMIC_ATTR |
|
||||
EXPORT_OP_FLUSH_ON_CLOSE,
|
||||
};
|
||||
|
|
|
@ -401,13 +401,23 @@ nfsd_file_check_writeback(struct nfsd_file *nf)
|
|||
struct file *file = nf->nf_file;
|
||||
struct address_space *mapping;
|
||||
|
||||
if (!file || !(file->f_mode & FMODE_WRITE))
|
||||
/* File not open for write? */
|
||||
if (!(file->f_mode & FMODE_WRITE))
|
||||
return false;
|
||||
|
||||
/*
|
||||
* Some filesystems (e.g. NFS) flush all dirty data on close.
|
||||
* On others, there is no need to wait for writeback.
|
||||
*/
|
||||
if (!(file_inode(file)->i_sb->s_export_op->flags & EXPORT_OP_FLUSH_ON_CLOSE))
|
||||
return false;
|
||||
|
||||
mapping = file->f_mapping;
|
||||
return mapping_tagged(mapping, PAGECACHE_TAG_DIRTY) ||
|
||||
mapping_tagged(mapping, PAGECACHE_TAG_WRITEBACK);
|
||||
}
|
||||
|
||||
|
||||
static bool nfsd_file_lru_add(struct nfsd_file *nf)
|
||||
{
|
||||
set_bit(NFSD_FILE_REFERENCED, &nf->nf_flags);
|
||||
|
|
|
@ -221,6 +221,7 @@ struct export_operations {
|
|||
#define EXPORT_OP_NOATOMIC_ATTR (0x10) /* Filesystem cannot supply
|
||||
atomic attribute updates
|
||||
*/
|
||||
#define EXPORT_OP_FLUSH_ON_CLOSE (0x20) /* fs flushes file data on close */
|
||||
unsigned long flags;
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue