diff options
| author | Linus Torvalds | 2021-12-04 17:22:53 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2021-12-04 17:22:53 -0800 |
| commit | 79a72162048e42a677bc7336a9f5d86fc3ff9558 (patch) | |
| tree | b2a0a672f0a93e2c51013b1ce235d4f1fe1c96fe /fs | |
| parent | 23b55d673d7527b093cd97b7c217c82e70cd1af0 (diff) | |
| parent | e445976537ad139162980bee015b7364e5b64fff (diff) | |
Merge tag 'xfs-5.16-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull xfs fix from Darrick Wong:
"Remove an unnecessary (and backwards) rename flags check that
duplicates a VFS level check"
* tag 'xfs-5.16-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
xfs: remove incorrect ASSERT in xfs_rename
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/xfs/xfs_inode.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 64b9bf334806..6771f357ad2c 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c @@ -3122,7 +3122,6 @@ xfs_rename( * appropriately. */ if (flags & RENAME_WHITEOUT) { - ASSERT(!(flags & (RENAME_NOREPLACE | RENAME_EXCHANGE))); error = xfs_rename_alloc_whiteout(mnt_userns, target_dp, &wip); if (error) return error; |