diff options
| author | Chris Mason <clm@fb.com> | 2016-09-02 02:29:34 +0200 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-09-02 02:29:34 +0200 |
| commit | cb887083d084d74421ae7bb18acca40568da791f (patch) | |
| tree | 0b8cc1019a229ceea587b72c29811d1d72b22879 /fs/btrfs/send.c | |
| parent | Btrfs: fix lockdep warning on deadlock against an inode's log mutex (diff) | |
| parent | btrfs: fix one bug that process may endlessly wait for ticket in wait_reserve... (diff) | |
| download | linux-cb887083d084d74421ae7bb18acca40568da791f.tar.xz linux-cb887083d084d74421ae7bb18acca40568da791f.zip | |
Merge tag 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.8
Diffstat (limited to 'fs/btrfs/send.c')
| -rw-r--r-- | fs/btrfs/send.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index efe129fe2678..a87675ffd02b 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c @@ -4268,10 +4268,12 @@ static int process_all_refs(struct send_ctx *sctx, } btrfs_release_path(path); + /* + * We don't actually care about pending_move as we are simply + * re-creating this inode and will be rename'ing it into place once we + * rename the parent directory. + */ ret = process_recorded_refs(sctx, &pending_move); - /* Only applicable to an incremental send. */ - ASSERT(pending_move == 0); - out: btrfs_free_path(path); return ret; |