From a26044607704ce1be732d1256ffc35c31ebce147 Mon Sep 17 00:00:00 2001 From: Tsutomu Itoh Date: Thu, 24 Mar 2016 16:47:28 +0900 Subject: btrfs-progs: send: fix handling of multiple snapshots We cannot send multiple snapshots at once. [before fix] # btrfs send ./snap[12] > snap12.data At subvol ./snap1 At subvol ./snap2 ERROR: parent determination failed for 0 # [after fix] # btrfs send ./snap[12] > snap12.data At subvol ./snap1 At subvol ./snap2 # Signed-off-by: Tsutomu Itoh Signed-off-by: David Sterba --- cmds-send.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'cmds-send.c') diff --git a/cmds-send.c b/cmds-send.c index bbe16d84..bdf1c977 100644 --- a/cmds-send.c +++ b/cmds-send.c @@ -673,15 +673,16 @@ int cmd_send(int argc, char **argv) if (ret < 0) goto out; - /* done with this subvol, so add it to the clone sources */ - ret = add_clone_source(&send, root_id); - if (ret < 0) { - error("not enough memory"); - goto out; + if (!full_send) { + /* done with this subvol, so add it to the clone sources */ + ret = add_clone_source(&send, root_id); + if (ret < 0) { + error("not enough memory"); + goto out; + } } parent_root_id = 0; - full_send = 0; } ret = 0; -- cgit v1.2.3