From d451fe2018546a7afbbb1e03942a971a8c32000e Mon Sep 17 00:00:00 2001 From: Omar Sandoval Date: Wed, 11 Mar 2020 01:17:09 -0700 Subject: [PATCH] btrfs-progs: receive: remove commented out transid checks The checks for a subvolume being modified after it was received have been commented out since they were added back in commit f1c24cd80dfd ("Btrfs-progs: add btrfs send/receive commands"). Let's just get rid of the noise. If they were ever in place, it would have never been possible to do an incremental send and running dedupe against the parent snapshot. That particular use case used to cause send, the kernel side, to fail (initially with a BUG_ON() and later with -EIO returned to user space), see commit b4f9a1a87a48 ("Btrfs: fix incremental send failure after deduplication"). Reviewed-by: Filipe Manana Signed-off-by: Omar Sandoval [ add Filipe's note ] Signed-off-by: David Sterba --- cmds/receive.c | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/cmds/receive.c b/cmds/receive.c index c4827c1d..a4bf8787 100644 --- a/cmds/receive.c +++ b/cmds/receive.c @@ -345,15 +345,6 @@ static int process_snapshot(const char *path, const u8 *uuid, u64 ctransid, parent_subvol->path[sub_len - root_len - 1] = '\0'; } } - /*if (rs_args.ctransid > rs_args.rtransid) { - if (!r->force) { - ret = -EINVAL; - fprintf(stderr, "ERROR: subvolume %s was modified after it was received.\n", r->subvol_parent_name); - goto out; - } else { - fprintf(stderr, "WARNING: subvolume %s was modified after it was received.\n", r->subvol_parent_name); - } - }*/ if (*parent_subvol->path == 0) args_v2.fd = dup(rctx->mnt_fd); @@ -771,22 +762,6 @@ static int process_clone(const char *path, u64 offset, u64 len, goto out; } } else { - /*if (rs_args.ctransid > rs_args.rtransid) { - if (!r->force) { - ret = -EINVAL; - fprintf(stderr, "ERROR: subvolume %s was " - "modified after it was " - "received.\n", - r->subvol_parent_name); - goto out; - } else { - fprintf(stderr, "WARNING: subvolume %s was " - "modified after it was " - "received.\n", - r->subvol_parent_name); - } - }*/ - /* strip the subvolume that we are receiving to from the start of subvol_path */ if (rctx->full_root_path) { size_t root_len = strlen(rctx->full_root_path);