Skip to content

Commit

Permalink
fs: Introduce DCACHE_DONTCACHE
Browse files Browse the repository at this point in the history
DCACHE_DONTCACHE indicates a dentry should not be cached on final
dput().

Also add a helper function to mark DCACHE_DONTCACHE on all dentries
pointing to a specific inode when that inode is being set I_DONTCACHE.

This facilitates dropping dentry references to inodes sooner which
require eviction to swap S_DAX mode.

Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
  • Loading branch information
Ira Weiny authored and Darrick J. Wong committed May 13, 2020
1 parent dae2f8e commit 2c567af
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 1 deletion.
19 changes: 19 additions & 0 deletions fs/dcache.c
Original file line number Diff line number Diff line change
Expand Up @@ -647,6 +647,10 @@ static inline bool retain_dentry(struct dentry *dentry)
if (dentry->d_op->d_delete(dentry))
return false;
}

if (unlikely(dentry->d_flags & DCACHE_DONTCACHE))
return false;

/* retain; LRU fodder */
dentry->d_lockref.count--;
if (unlikely(!(dentry->d_flags & DCACHE_LRU_LIST)))
Expand All @@ -656,6 +660,21 @@ static inline bool retain_dentry(struct dentry *dentry)
return true;
}

void d_mark_dontcache(struct inode *inode)
{
struct dentry *de;

spin_lock(&inode->i_lock);
hlist_for_each_entry(de, &inode->i_dentry, d_u.d_alias) {
spin_lock(&de->d_lock);
de->d_flags |= DCACHE_DONTCACHE;
spin_unlock(&de->d_lock);
}
inode->i_state |= I_DONTCACHE;
spin_unlock(&inode->i_lock);
}
EXPORT_SYMBOL(d_mark_dontcache);

/*
* Finish off a dentry we've decided to kill.
* dentry->d_lock must be held, returns with it unlocked.
Expand Down
2 changes: 1 addition & 1 deletion fs/xfs/xfs_icache.c
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ xfs_iget_cache_miss(
*/
iflags = XFS_INEW;
if (flags & XFS_IGET_DONTCACHE)
VFS_I(ip)->i_state |= I_DONTCACHE;
d_mark_dontcache(VFS_I(ip));
ip->i_udquot = NULL;
ip->i_gdquot = NULL;
ip->i_pdquot = NULL;
Expand Down
2 changes: 2 additions & 0 deletions include/linux/dcache.h
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,8 @@ struct dentry_operations {

#define DCACHE_REFERENCED 0x00000040 /* Recently used, don't discard. */

#define DCACHE_DONTCACHE 0x00000080 /* Purge from memory on final dput() */

#define DCACHE_CANT_MOUNT 0x00000100
#define DCACHE_GENOCIDE 0x00000200
#define DCACHE_SHRINK_LIST 0x00000400
Expand Down
1 change: 1 addition & 0 deletions include/linux/fs.h
Original file line number Diff line number Diff line change
Expand Up @@ -3055,6 +3055,7 @@ static inline int generic_drop_inode(struct inode *inode)
return !inode->i_nlink || inode_unhashed(inode) ||
(inode->i_state & I_DONTCACHE);
}
extern void d_mark_dontcache(struct inode *inode);

extern struct inode *ilookup5_nowait(struct super_block *sb,
unsigned long hashval, int (*test)(struct inode *, void *),
Expand Down

0 comments on commit 2c567af

Please sign in to comment.