Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cba36f70 authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Greg Kroah-Hartman
Browse files

xfs: fix scrub flagging rtinherit even if there is no rt device 



[ Upstream commit c1f6b1ac00756a7108e5fcb849a2f8230c0b62a5 ]

The kernel has always allowed directories to have the rtinherit flag
set, even if there is no rt device, so this check is wrong.

Fixes: 80e4e126 ("xfs: scrub inodes")
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 955113c8

fs/xfs/scrub/inode.c

+1 −2
Original line number Diff line number Diff line
@@ -131,8 +131,7 @@ xchk_inode_flags( 
		goto bad;



	/* rt flags require rt device */

	if ((flags & (XFS_DIFLAG_REALTIME | XFS_DIFLAG_RTINHERIT)) &&

	    !mp->m_rtdev_targp)

	if ((flags & XFS_DIFLAG_REALTIME) && !mp->m_rtdev_targp)

		goto bad;



	/* new rt bitmap flag only valid for rbmino */