summaryrefslogtreecommitdiff
path: root/fs/xfs/xfs_inode.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-11-02 09:22:16 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2024-11-02 09:22:16 -1000
commitf6a7b4ec74a03cb9ad1fee6b8b6615cc57b927b1 (patch)
treea71098b05ee858b5a9f3d7fdf6c8193279ced19e /fs/xfs/xfs_inode.c
parent11066801dd4b7c4d75fce65c812723a80c1481ae (diff)
parent81a1e1c32ef474c20ccb9f730afe1ac25b1c62a4 (diff)
downloadlinux-f6a7b4ec74a03cb9ad1fee6b8b6615cc57b927b1.tar.gz
linux-f6a7b4ec74a03cb9ad1fee6b8b6615cc57b927b1.tar.bz2
linux-f6a7b4ec74a03cb9ad1fee6b8b6615cc57b927b1.zip
Merge tag 'xfs-6.12-fixes-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull xfs fixes from Carlos Maiolino: - fix a sysbot reported crash on filestreams - Reduce cpu time spent searching for extents in a very fragmented FS - Check for delayed allocations before setting extsize * tag 'xfs-6.12-fixes-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: xfs: streamline xfs_filestream_pick_ag xfs: fix finding a last resort AG in xfs_filestream_pick_ag xfs: Reduce unnecessary searches when searching for the best extents xfs: Check for delayed allocations before setting extsize
Diffstat (limited to 'fs/xfs/xfs_inode.c')
-rw-r--r--fs/xfs/xfs_inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index bcc277fc0a83..19dcb569a3e7 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -1409,7 +1409,7 @@ xfs_inactive(
if (S_ISREG(VFS_I(ip)->i_mode) &&
(ip->i_disk_size != 0 || XFS_ISIZE(ip) != 0 ||
- ip->i_df.if_nextents > 0 || ip->i_delayed_blks > 0))
+ xfs_inode_has_filedata(ip)))
truncate = 1;
if (xfs_iflags_test(ip, XFS_IQUOTAUNCHECKED)) {