| Message ID | 1391635161-3983-1-git-send-email-jbacik@fb.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Wed, Feb 5, 2014 at 9:19 PM, Josef Bacik <jbacik@fb.com> wrote: > Wang noticed that he was failing btrfs/030 even though me and Filipe couldn't > reproduce. Turns out this is because Wang didn't have CONFIG_BTRFS_ASSERT set, > which meant that a key part of Filipe's original patch was not being built in. > This appears to be a mess up with merging Filipe's patch as it does not exist in > his original patch. Fix this by changing how we make sure del_waiting_dir_move > asserts that it did not error and take the function out of the ifdef check. > This makes btrfs/030 pass with the assert on or off. Thanks, > > Signed-off-by: Josef Bacik <jbacik@fb.com> Reviewed-by: Filipe Manana <fdmanana@gmail.com> Thanks Josef. I actually had the ASSERT(del_waiting_dir_move(sctx, pm->ino) == 0), I didn't had only the function declaration inside #ifdef CONFIG_BTRFS_ASSERT ... #endif. Obviously because I never built with assertions disabled and totally forgot about not using expressions with side effects inside assert macros. > --- > fs/btrfs/send.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c > index f71fcbc..afb145d 100644 > --- a/fs/btrfs/send.c > +++ b/fs/btrfs/send.c > @@ -2734,8 +2734,6 @@ static int add_waiting_dir_move(struct send_ctx *sctx, u64 ino) > return 0; > } > > -#ifdef CONFIG_BTRFS_ASSERT > - > static int del_waiting_dir_move(struct send_ctx *sctx, u64 ino) > { > struct rb_node *n = sctx->waiting_dir_moves.rb_node; > @@ -2756,8 +2754,6 @@ static int del_waiting_dir_move(struct send_ctx *sctx, u64 ino) > return -ENOENT; > } > > -#endif > - > static int add_pending_dir_move(struct send_ctx *sctx, u64 parent_ino) > { > struct rb_node **p = &sctx->pending_dir_moves.rb_node; > @@ -2862,7 +2858,9 @@ static int apply_dir_move(struct send_ctx *sctx, struct pending_dir_move *pm) > } > > sctx->send_progress = sctx->cur_ino + 1; > - ASSERT(del_waiting_dir_move(sctx, pm->ino) == 0); > + ret = del_waiting_dir_move(sctx, pm->ino); > + ASSERT(ret == 0); > + > ret = get_cur_path(sctx, pm->ino, pm->gen, to_path); > if (ret < 0) > goto out; > -- > 1.8.3.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index f71fcbc..afb145d 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -2734,8 +2734,6 @@ static int add_waiting_dir_move(struct send_ctx *sctx, u64 ino) return 0; } -#ifdef CONFIG_BTRFS_ASSERT - static int del_waiting_dir_move(struct send_ctx *sctx, u64 ino) { struct rb_node *n = sctx->waiting_dir_moves.rb_node; @@ -2756,8 +2754,6 @@ static int del_waiting_dir_move(struct send_ctx *sctx, u64 ino) return -ENOENT; } -#endif - static int add_pending_dir_move(struct send_ctx *sctx, u64 parent_ino) { struct rb_node **p = &sctx->pending_dir_moves.rb_node; @@ -2862,7 +2858,9 @@ static int apply_dir_move(struct send_ctx *sctx, struct pending_dir_move *pm) } sctx->send_progress = sctx->cur_ino + 1; - ASSERT(del_waiting_dir_move(sctx, pm->ino) == 0); + ret = del_waiting_dir_move(sctx, pm->ino); + ASSERT(ret == 0); + ret = get_cur_path(sctx, pm->ino, pm->gen, to_path); if (ret < 0) goto out;
Wang noticed that he was failing btrfs/030 even though me and Filipe couldn't reproduce. Turns out this is because Wang didn't have CONFIG_BTRFS_ASSERT set, which meant that a key part of Filipe's original patch was not being built in. This appears to be a mess up with merging Filipe's patch as it does not exist in his original patch. Fix this by changing how we make sure del_waiting_dir_move asserts that it did not error and take the function out of the ifdef check. This makes btrfs/030 pass with the assert on or off. Thanks, Signed-off-by: Josef Bacik <jbacik@fb.com> --- fs/btrfs/send.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)