* [PATCH] xfs: remove incorrect ASSERT in xfs_rename
@ 2021-12-01 5:17 Eric Sandeen
2021-12-01 16:42 ` Eric Sandeen
2021-12-01 17:57 ` Darrick J. Wong
0 siblings, 2 replies; 3+ messages in thread
From: Eric Sandeen @ 2021-12-01 5:17 UTC (permalink / raw)
To: xfs, Darrick J. Wong; +Cc: Paolo Bonzini
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>
---
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index 64b9bf3..6771f35 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -3122,7 +3122,6 @@ struct xfs_iunlink {
* 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;
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] xfs: remove incorrect ASSERT in xfs_rename
2021-12-01 5:17 [PATCH] xfs: remove incorrect ASSERT in xfs_rename Eric Sandeen
@ 2021-12-01 16:42 ` Eric Sandeen
2021-12-01 17:57 ` Darrick J. Wong
1 sibling, 0 replies; 3+ messages in thread
From: Eric Sandeen @ 2021-12-01 16:42 UTC (permalink / raw)
To: xfs, Darrick J. Wong
On 11/30/21 11:17 PM, Eric Sandeen wrote:
> 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>
> ---
>
> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> index 64b9bf3..6771f35 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -3122,7 +3122,6 @@ struct xfs_iunlink {
> * 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;
>
Ugh, I don't understand this flavor of whitespace mangling I'm getting now,
I'm sorry :(
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] xfs: remove incorrect ASSERT in xfs_rename
2021-12-01 5:17 [PATCH] xfs: remove incorrect ASSERT in xfs_rename Eric Sandeen
2021-12-01 16:42 ` Eric Sandeen
@ 2021-12-01 17:57 ` Darrick J. Wong
1 sibling, 0 replies; 3+ messages in thread
From: Darrick J. Wong @ 2021-12-01 17:57 UTC (permalink / raw)
To: Eric Sandeen; +Cc: xfs, Paolo Bonzini
On Tue, Nov 30, 2021 at 11:17:56PM -0600, Eric Sandeen wrote:
> 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>
LGTM,
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
> ---
>
> diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
> index 64b9bf3..6771f35 100644
> --- a/fs/xfs/xfs_inode.c
> +++ b/fs/xfs/xfs_inode.c
> @@ -3122,7 +3122,6 @@ struct xfs_iunlink {
> * 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;
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-12-01 17:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-01 5:17 [PATCH] xfs: remove incorrect ASSERT in xfs_rename Eric Sandeen
2021-12-01 16:42 ` Eric Sandeen
2021-12-01 17:57 ` Darrick J. Wong
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.