diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2022-01-10 09:55:44 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2022-01-10 09:55:44 +0100 |
| commit | c524559acd5d0903fa6e3b8e608bf5851de7217a (patch) | |
| tree | 91acebdb63e32973d08f93c21f44aae0f4c5ccc8 /fs/xfs/xfs_inode.c | |
| parent | Merge branch 'for-5.17/apple' into for-linus (diff) | |
| parent | HID: hidraw: Replace hidraw device table mutex with a rwsem (diff) | |
| download | wireguard-linux-c524559acd5d0903fa6e3b8e608bf5851de7217a.tar.xz wireguard-linux-c524559acd5d0903fa6e3b8e608bf5851de7217a.zip | |
Merge branch 'for-5.17/hidraw' into for-linus
- locking performance improvement for hidraw code (André Almeida)
Diffstat (limited to 'fs/xfs/xfs_inode.c')
| -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; |