Commit dae2f8ed authored by Ira Weiny's avatar Ira Weiny Committed by Darrick J. Wong
Browse files

fs: Lift XFS_IDONTCACHE to the VFS layer 



DAX effective mode (S_DAX) changes requires inode eviction.

XFS has an advisory flag (XFS_IDONTCACHE) to prevent caching of the
inode if no other additional references are taken.  We lift this flag to
the VFS layer and change the behavior slightly by allowing the flag to
remain even if multiple references are taken.

This will expedite the eviction of inodes to change S_DAX.

Cc: Al Viro <viro@zeniv.linux.org.uk>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 83d90886

fs/xfs/xfs_icache.c

+2 −2
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ xfs_iget_cache_hit( 
		xfs_ilock(ip, lock_flags);



	if (!(flags & XFS_IGET_INCORE))

		xfs_iflags_clear(ip, XFS_ISTALE | XFS_IDONTCACHE);

		xfs_iflags_clear(ip, XFS_ISTALE);

	XFS_STATS_INC(mp, xs_ig_found);



	return 0;
@@ -561,7 +561,7 @@ xfs_iget_cache_miss( 
	 */

	iflags = XFS_INEW;

	if (flags & XFS_IGET_DONTCACHE)

		iflags |= XFS_IDONTCACHE;

		VFS_I(ip)->i_state |= I_DONTCACHE;

	ip->i_udquot = NULL;

	ip->i_gdquot = NULL;

	ip->i_pdquot = NULL;

fs/xfs/xfs_inode.h

+1 −2
Original line number Diff line number Diff line
@@ -218,8 +218,7 @@ static inline bool xfs_inode_has_cow_data(struct xfs_inode *ip) 
#define XFS_IFLOCK		(1 << __XFS_IFLOCK_BIT)

#define __XFS_IPINNED_BIT	8	 /* wakeup key for zero pin count */

#define XFS_IPINNED		(1 << __XFS_IPINNED_BIT)

#define XFS_IDONTCACHE		(1 << 9) /* don't cache the inode long term */

#define XFS_IEOFBLOCKS		(1 << 10)/* has the preallocblocks tag set */

#define XFS_IEOFBLOCKS		(1 << 9) /* has the preallocblocks tag set */

/*

 * If this unlinked inode is in the middle of recovery, don't let drop_inode

 * truncate and free the inode.  This can happen if we iget the inode during

fs/xfs/xfs_super.c

+1 −1
Original line number Diff line number Diff line
@@ -702,7 +702,7 @@ xfs_fs_drop_inode( 
		return 0;

	}



	return generic_drop_inode(inode) || (ip->i_flags & XFS_IDONTCACHE);

	return generic_drop_inode(inode);

}



static void

include/linux/fs.h

+5 −1
Original line number Diff line number Diff line
@@ -2156,6 +2156,8 @@ static inline void kiocb_clone(struct kiocb *kiocb, struct kiocb *kiocb_src, 
 *

 * I_CREATING		New object's inode in the middle of setting up.

 *

 * I_DONTCACHE		Evict inode as soon as it is not used anymore.

 *

 * Q: What is the difference between I_WILL_FREE and I_FREEING?

 */

#define I_DIRTY_SYNC		(1 << 0)
@@ -2178,6 +2180,7 @@ static inline void kiocb_clone(struct kiocb *kiocb, struct kiocb *kiocb_src, 
#define I_WB_SWITCH		(1 << 13)

#define I_OVL_INUSE		(1 << 14)

#define I_CREATING		(1 << 15)

#define I_DONTCACHE		(1 << 16)



#define I_DIRTY_INODE (I_DIRTY_SYNC | I_DIRTY_DATASYNC)

#define I_DIRTY (I_DIRTY_INODE | I_DIRTY_PAGES)
@@ -3049,7 +3052,8 @@ extern int inode_needs_sync(struct inode *inode); 
extern int generic_delete_inode(struct inode *inode);

static inline int generic_drop_inode(struct inode *inode)

{

	return !inode->i_nlink || inode_unhashed(inode);

	return !inode->i_nlink || inode_unhashed(inode) ||

		(inode->i_state & I_DONTCACHE);

}



extern struct inode *ilookup5_nowait(struct super_block *sb,

CRA Git | Maintained and supported by SUSTech CRA and CCSE