Skip to content

Commit e445976

Browse files
Eric SandeenDarrick J. Wong
authored andcommitted
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 <[email protected]> Signed-off-by: Eric Sandeen <[email protected]> Reviewed-by: Darrick J. Wong <[email protected]> Signed-off-by: Darrick J. Wong <[email protected]>
1 parent 1090427 commit e445976

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

fs/xfs/xfs_inode.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3122,7 +3122,6 @@ xfs_rename(
31223122
* appropriately.
31233123
*/
31243124
if (flags & RENAME_WHITEOUT) {
3125-
ASSERT(!(flags & (RENAME_NOREPLACE | RENAME_EXCHANGE)));
31263125
error = xfs_rename_alloc_whiteout(mnt_userns, target_dp, &wip);
31273126
if (error)
31283127
return error;

0 commit comments

Comments
 (0)