btrfs: fix resending received snapshot with parent
This fixes a regression introduced by37b8d27d
between v4.1 and v4.2. When a snapshot is received, its received_uuid is set to the original uuid of the subvolume. When that snapshot is then resent to a third filesystem, it's received_uuid is set to the second uuid instead of the original one. The same was true for the parent_uuid. This behaviour was partially changed in37b8d27d
, but in that patch only the parent_uuid was taken from the real original, not the uuid itself, causing the search for the parent to fail in the case below. This happens for example when trying to send a series of linked snapshots (e.g. created by snapper) from the backup file system back to the original one. The following commands reproduce the issue in v4.2.1 (no error in 4.1.6) # setup three test file systems for i in 1 2 3; do truncate -s 50M fs$i mkfs.btrfs fs$i mkdir $i mount fs$i $i done echo "content" > 1/testfile btrfs su snapshot -r 1/ 1/snap1 echo "changed content" > 1/testfile btrfs su snapshot -r 1/ 1/snap2 # works fine: btrfs send 1/snap1 | btrfs receive 2/ btrfs send -p 1/snap1 1/snap2 | btrfs receive 2/ # ERROR: could not find parent subvolume btrfs send 2/snap1 | btrfs receive 3/ btrfs send -p 2/snap1 2/snap2 | btrfs receive 3/ Signed-off-by: Robin Ruede <rruede+git@gmail.com> Fixes:37b8d27de5
("Btrfs: use received_uuid of parent during send") Cc: stable@vger.kernel.org # v4.2+ Reviewed-by: Filipe Manana <fdmanana@suse.com> Tested-by: Ed Tomlinson <edt@aei.ca>
This commit is contained in:
parent
d906d49fc5
commit
b96b1db039
|
@ -2343,8 +2343,14 @@ static int send_subvol_begin(struct send_ctx *sctx)
|
||||||
}
|
}
|
||||||
|
|
||||||
TLV_PUT_STRING(sctx, BTRFS_SEND_A_PATH, name, namelen);
|
TLV_PUT_STRING(sctx, BTRFS_SEND_A_PATH, name, namelen);
|
||||||
TLV_PUT_UUID(sctx, BTRFS_SEND_A_UUID,
|
|
||||||
sctx->send_root->root_item.uuid);
|
if (!btrfs_is_empty_uuid(sctx->send_root->root_item.received_uuid))
|
||||||
|
TLV_PUT_UUID(sctx, BTRFS_SEND_A_UUID,
|
||||||
|
sctx->send_root->root_item.received_uuid);
|
||||||
|
else
|
||||||
|
TLV_PUT_UUID(sctx, BTRFS_SEND_A_UUID,
|
||||||
|
sctx->send_root->root_item.uuid);
|
||||||
|
|
||||||
TLV_PUT_U64(sctx, BTRFS_SEND_A_CTRANSID,
|
TLV_PUT_U64(sctx, BTRFS_SEND_A_CTRANSID,
|
||||||
le64_to_cpu(sctx->send_root->root_item.ctransid));
|
le64_to_cpu(sctx->send_root->root_item.ctransid));
|
||||||
if (parent_root) {
|
if (parent_root) {
|
||||||
|
|
Loading…
Reference in New Issue