RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-02-12 15:47:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: restore: remove loop check during file copy

Browse Source 
There's some kind of looping protection during copying file extents,
mostly likely to avoid endless loops on severely damaged filesystems.
This has been bothering users and makes restoring hard to automate as
it requires user attention to press 'y' or 'a'. This has not been well
documented either.

The number of loops is 1024 which looks arbitrary and hard to justify.
This eg. means that a file with many fragments hits the interactive
question more than once.

There are other checks when iterating the leaves that would catch
corruptions or other errors, so the looping would happen in some rare
and rather artificial case when some kind of loop exists inside the
extent items. This is not easily possible if possible at all as the
items do not directly reference other.

In case there's some genuine error found that would require a looping
protection, we'll add it or extend the checks to identify the loop.

Issue: #59
Issue: #164
Issue: #237
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2021-06-12 20:58:43 +02:00
parent afe055f438
commit 4258b7161f
1 changed files with 0 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
cmds/restore.c
View File

@ -467,34 +467,6 @@ out:
return ret;
}
enum loop_response {
LOOP_STOP,
LOOP_CONTINUE,
LOOP_DONTASK
};
static enum loop_response ask_to_continue(const char *file)
{
char buf[16];
char *ret;
printf("We seem to be looping a lot on %s, do you want to keep going "
"on ? (y/N/a): ", file);
again:
ret = fgets(buf, 16, stdin);
if (!ret || *ret == '\n' || tolower(*ret) == 'n')
return LOOP_STOP;
if (tolower(*ret) == 'a')
return LOOP_DONTASK;
if (tolower(*ret) != 'y') {
printf("Please enter one of 'y', 'n', or 'a': ");
goto again;
}
return LOOP_CONTINUE;
}
static int set_file_xattrs(struct btrfs_root *root, u64 inode,
int fd, const char *file_name)
{
@ -653,7 +625,6 @@ static int copy_file(struct btrfs_root *root, int fd, struct btrfs_key *key,
int ret;
int extent_type;
int compression;
int loops = 0;
u64 found_size = 0;
struct timespec times[2];
int times_ok = 0;
@ -716,17 +687,6 @@ static int copy_file(struct btrfs_root *root, int fd, struct btrfs_key *key,
}
while (1) {
if (loops >= 0 && loops++ >= 1024) {
enum loop_response resp;
resp = ask_to_continue(file);
if (resp == LOOP_STOP)
break;
else if (resp == LOOP_CONTINUE)
loops = 0;
else if (resp == LOOP_DONTASK)
loops = -1;
}
if (path.slots[0] >= btrfs_header_nritems(leaf)) {
do {
ret = next_leaf(root, &path);