From b5a09775c6e3dd6c842764b026e1764a057b7dfd Mon Sep 17 00:00:00 2001 From: Wang Shilong Date: Wed, 18 Dec 2013 17:56:33 +0800 Subject: [PATCH] Btrfs-progs: receive: fix the case that we can not find the subvolume If we change our default subvolume, btrfs receive will fail to find subvolume. To fix this problem, we have three ideas: 1.make btrfs snapshot ioctl support passing source subvolume's objectid. 2.when we want to using interval subvolume path, we mount it other place that use subvolume 5 as its default subvolume. 3.tell the user to mount the toplevel subvol by himself and run receive We's better use the third approach because first patch will bother kernel change and the second approach is not very good for power users. So give this option to users. Reported-by: Michael Welsh Duggan Signed-off-by: Wang Shilong Signed-off-by: Miao Xie Signed-off-by: David Sterba Signed-off-by: Chris Mason --- cmds-receive.c | 11 +++++++++-- man/btrfs.8.in | 15 ++++++++++----- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/cmds-receive.c b/cmds-receive.c index ed44107..cce37a7 100644 --- a/cmds-receive.c +++ b/cmds-receive.c @@ -257,8 +257,15 @@ static int process_snapshot(const char *path, const u8 *uuid, u64 ctransid, O_RDONLY | O_NOATIME); if (args_v2.fd < 0) { ret = -errno; - fprintf(stderr, "ERROR: open %s failed. %s\n", - parent_subvol->path, strerror(-ret)); + if (errno != ENOENT) + fprintf(stderr, "ERROR: open %s failed. %s\n", + parent_subvol->path, strerror(-ret)); + else + fprintf(stderr, + "It seems that you have changed your default " + "subvolume or you specify other subvolume to\n" + "mount btrfs, try to remount this btrfs filesystem " + "with fs tree, and run btrfs receive again!\n"); goto out; } diff --git a/man/btrfs.8.in b/man/btrfs.8.in index c11b53a..8fea115 100644 --- a/man/btrfs.8.in +++ b/man/btrfs.8.in @@ -660,11 +660,16 @@ Receive subvolumes from stdin. Receives one or more subvolumes that were previously sent with btrfs send. The received subvolumes are stored into \fI\fP. -btrfs receive will fail in case a receiving subvolume -already exists. It will also fail in case a previously -received subvolume was changed after it was received. -After receiving a subvolume, it is immediately set to -read only. +btrfs receive will fail with the following case: + +1.a receiving subvolume already exists. + +2.a previously received subvolume was changed after it was received. + +3.default subvolume is changed or you don't mount btrfs filesystem with +fs tree. + +After receiving a subvolume, it is immediately set to read only. .RS \fIOptions\fR -- 2.7.4