Merge tag 'vfs-5.8-merge-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[linux-2.6-microblaze.git] / fs / xfs / xfs_icache.c

diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
index 0a5ac6f..5daef65 100644 (file)
--- a/fs/xfs/xfs_icache.c
+++ b/fs/xfs/xfs_icache.c
@@ -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;
@@ -585,7 +585,7 @@ xfs_iget_cache_miss(
         */
        iflags = XFS_INEW;
        if (flags & XFS_IGET_DONTCACHE)
-               iflags |= XFS_IDONTCACHE;
+               d_mark_dontcache(VFS_I(ip));
        ip->i_udquot = NULL;
        ip->i_gdquot = NULL;
        ip->i_pdquot = NULL;