diff options
| author | Eric Sandeen <sandeen@redhat.com> | 2021-12-01 18:31:03 +0100 |
|---|---|---|
| committer | Darrick J. Wong <djwong@kernel.org> | 2021-12-02 02:27:48 +0100 |
| commit | e445976537ad139162980bee015b7364e5b64fff (patch) | |
| tree | 729a5cd8272a39827acb0dbd29ef006dcf5039d8 | |
| parent | xfs: remove xfs_inew_wait (diff) | |
| download | linux-e445976537ad139162980bee015b7364e5b64fff.tar.xz linux-e445976537ad139162980bee015b7364e5b64fff.zip | |
xfs: remove incorrect ASSERT in xfs_rename
This ASSERT in xfs_rename is a) incorrect, because
(RENAME_WHITEOUT|RENAME_NOREPLACE) is a valid combination, and
b) unnecessary, because actual invalid flag combinations are already
handled at the vfs level in do_renameat2() before we get called.
So, remove it.
Reported-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
| -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; |