github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-31 02:24:24 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Bug fixes for 6.11-rc4:

Browse Source 
* Check for presence of only 'attr' feature before scrubbing an inode's
     attribute fork.
   * Restore the behaviour of setting AIL thread to TASK_INTERRUPTIBLE for
     long (i.e. 50ms) sleep durations to prevent high load averages.
   * Do not allow users to change the realtime flag of a file unless the
     datadev and rtdev both support fsdax access modes.
 
 Signed-off-by: Chandan Babu R <chandanbabu@kernel.org>
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQQjMC4mbgVeU7MxEIYH7y4RirJu9AUCZr1wqwAKCRAH7y4RirJu
 9MYxAQCgHoAK8rqxb4obrrGmqVcHJdnHDYqSFRqbbvytRHybZgEA2hfaNbNpuQYT
 JOV5pGOUJf1LiSc5D6MBepg2BAFRNwo=
 =7Ibh
 -----END PGP SIGNATURE-----

Merge tag 'xfs-6.11-fixes-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

Pull xfs fixes from Chandan Babu:

 - Check for presence of only 'attr' feature before scrubbing an inode's
   attribute fork.

 - Restore the behaviour of setting AIL thread to TASK_INTERRUPTIBLE for
   long (i.e. 50ms) sleep durations to prevent high load averages.

 - Do not allow users to change the realtime flag of a file unless the
   datadev and rtdev both support fsdax access modes.

* tag 'xfs-6.11-fixes-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: conditionally allow FS_XFLAG_REALTIME changes if S_DAX is set
  xfs: revert AIL TASK_KILLABLE threshold
  xfs: attr forks require attr, not attr2
This commit is contained in:
Linus Torvalds 2024-08-17 09:51:28 -07:00
commit d09840f8b3
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/xfs/scrub/bmap.c
View File

@ -938,7 +938,13 @@ xchk_bmap(
}
break;
case XFS_ATTR_FORK:
if (!xfs_has_attr(mp) && !xfs_has_attr2(mp))
/*
* "attr" means that an attr fork was created at some point in
* the life of this filesystem. "attr2" means that inodes have
* variable-sized data/attr fork areas. Hence we only check
* attr here.
*/
if (!xfs_has_attr(mp))
xchk_ino_set_corrupt(sc, sc->ip->i_ino);
break;
default:

11
fs/xfs/xfs_ioctl.c
View File

@ -483,6 +483,17 @@ xfs_ioctl_setattr_xflags(
/* Can't change realtime flag if any extents are allocated. */
if (ip->i_df.if_nextents || ip->i_delayed_blks)
return -EINVAL;
/*
* If S_DAX is enabled on this file, we can only switch the
* device if both support fsdax. We can't update S_DAX because
* there might be other threads walking down the access paths.
*/
if (IS_DAX(VFS_I(ip)) &&
(mp->m_ddev_targp->bt_daxdev == NULL ||
(mp->m_rtdev_targp &&
mp->m_rtdev_targp->bt_daxdev == NULL)))
return -EINVAL;
}
if (rtflag) {

7
fs/xfs/xfs_trans_ail.c
View File

@ -644,7 +644,12 @@ xfsaild(
set_freezable();
while (1) {
if (tout)
/*
* Long waits of 50ms or more occur when we've run out of items
* to push, so we only want uninterruptible state if we're
* actually blocked on something.
*/
if (tout && tout <= 20)
set_current_state(TASK_KILLABLE|TASK_FREEZABLE);
else
set_current_state(TASK_INTERRUPTIBLE|TASK_FREEZABLE);