diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2020-11-08 10:23:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2020-11-08 10:23:07 -0800 |
| commit | 9dbc1c03eeb534b82647cccb059aca0685d449a7 (patch) | |
| tree | 1ccaaa5e1e0c4172befac6e161b9e4d9841ca3c5 /fs/xfs/scrub/inode.c | |
| parent | Merge branch 'hch' (patches from Christoph) (diff) | |
| parent | xfs: only flush the unshared range in xfs_reflink_unshare (diff) | |
| download | linux-9dbc1c03eeb534b82647cccb059aca0685d449a7.tar.gz linux-9dbc1c03eeb534b82647cccb059aca0685d449a7.tar.bz2 linux-9dbc1c03eeb534b82647cccb059aca0685d449a7.zip | |
Merge tag 'xfs-5.10-fixes-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull xfs fixes from Darrick Wong:
- Fix an uninitialized struct problem
- Fix an iomap problem zeroing unwritten EOF blocks
- Fix some clumsy error handling when writeback fails on filesystems
with blocksize < pagesize
- Fix a retry loop not resetting loop variables properly
- Fix scrub flagging rtinherit inodes on a non-rt fs, since the kernel
actually does permit that combination
- Fix excessive page cache flushing when unsharing part of a file
* tag 'xfs-5.10-fixes-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
xfs: only flush the unshared range in xfs_reflink_unshare
xfs: fix scrub flagging rtinherit even if there is no rt device
xfs: fix missing CoW blocks writeback conversion retry
iomap: clean up writeback state logic on writepage error
iomap: support partial page discard on writeback block mapping failure
xfs: flush new eof page on truncate to avoid post-eof corruption
xfs: set xefi_discard when creating a deferred agfl free log intent item
Diffstat (limited to 'fs/xfs/scrub/inode.c')
| -rw-r--r-- | fs/xfs/scrub/inode.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/xfs/scrub/inode.c b/fs/xfs/scrub/inode.c index 3aa85b64de36..bb25ff1b770d 100644 --- a/fs/xfs/scrub/inode.c +++ b/fs/xfs/scrub/inode.c @@ -121,8 +121,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 */ |