Skip to content

Commit

Permalink
Btrfs: don't treat top/root directory inode as deleted/reused
Browse files Browse the repository at this point in the history
We can't do the deleted/reused logic for top/root inodes as it would
create a stream that tries to delete and recreate the root dir.

Reported-by: Alex Lyakas <alex.bolshoy.btrfs@gmail.com>
Signed-off-by: Alexander Block <ablock84@googlemail.com>
  • Loading branch information
Alexander Block authored and Chris Mason committed Oct 1, 2012
1 parent 2981e22 commit 6d85ed0
Showing 1 changed file with 20 additions and 1 deletion.
21 changes: 20 additions & 1 deletion fs/btrfs/send.c
Original file line number Diff line number Diff line change
Expand Up @@ -2627,6 +2627,12 @@ static int can_rmdir(struct send_ctx *sctx, u64 dir, u64 send_progress)
struct btrfs_key loc;
struct btrfs_dir_item *di;

/*
* Don't try to rmdir the top/root subvolume dir.
*/
if (dir == BTRFS_FIRST_FREE_OBJECTID)
return 0;

path = alloc_path_for_send();
if (!path)
return -ENOMEM;
Expand Down Expand Up @@ -2687,6 +2693,12 @@ static int process_recorded_refs(struct send_ctx *sctx)

verbose_printk("btrfs: process_recorded_refs %llu\n", sctx->cur_ino);

/*
* This should never happen as the root dir always has the same ref
* which is always '..'
*/
BUG_ON(sctx->cur_ino <= BTRFS_FIRST_FREE_OBJECTID);

valid_path = fs_path_alloc(sctx);
if (!valid_path) {
ret = -ENOMEM;
Expand Down Expand Up @@ -4094,7 +4106,14 @@ static int changed_inode(struct send_ctx *sctx,

right_gen = btrfs_inode_generation(sctx->right_path->nodes[0],
right_ii);
if (left_gen != right_gen)

/*
* The cur_ino = root dir case is special here. We can't treat
* the inode as deleted+reused because it would generate a
* stream that tries to delete/mkdir the root dir.
*/
if (left_gen != right_gen &&
sctx->cur_ino != BTRFS_FIRST_FREE_OBJECTID)
sctx->cur_inode_new_gen = 1;
}

Expand Down

0 comments on commit 6d85ed0

Please sign in to comment.