diff options
| author | Peter Stuge <peter@stuge.se> | 2013-03-12 13:38:12 -0400 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2013-03-18 18:14:19 +0100 |
| commit | 4ddd5874d9800f7f2d34366b00b338f9a2476836 (patch) | |
| tree | 9935515e7d22561451562eb133910a94bb3aa8bf | |
| parent | c2839e123a22a51db62981ca077ea0d88ea5e8b1 (diff) | |
restore: Split output directory and btrfs-local path search_dir() parameters
search_dir() recurses down the btrfs tree, and used to take the output
path for every item (i.e. in the running system, output root directory
concatenated with btrfs-local pathname) passed as the only path
parameter. Moving the output root directory to a separate parameter
and passing the btrfs-local pathname for each file and directory
separately allows easy filtering based on the btrfs-local pathname.
Signed-off-by: Peter Stuge <peter@stuge.se>
Signed-off-by: Josef Bacik <josef@redhat.com>
| -rw-r--r-- | cmds-restore.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/cmds-restore.c b/cmds-restore.c index 97818015..215958f8 100644 --- a/cmds-restore.c +++ b/cmds-restore.c @@ -39,6 +39,7 @@ #include "utils.h" #include "commands.h" +static char fs_name[4096]; static char path_name[4096]; static int get_snaps = 0; static int verbose = 0; @@ -454,7 +455,7 @@ set_size: } static int search_dir(struct btrfs_root *root, struct btrfs_key *key, - const char *dir) + const char *output_rootdir, const char *dir) { struct btrfs_path *path; struct extent_buffer *leaf; @@ -558,8 +559,11 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key, type = btrfs_dir_type(leaf, dir_item); btrfs_dir_item_key_to_cpu(leaf, dir_item, &location); - snprintf(path_name, 4096, "%s/%s", dir, filename); + /* full path from root of btrfs being restored */ + snprintf(fs_name, 4096, "%s/%s", dir, filename); + /* full path from system root */ + snprintf(path_name, 4096, "%s%s", output_rootdir, fs_name); /* * At this point we're only going to restore directories and @@ -607,7 +611,7 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key, } } else if (type == BTRFS_FT_DIR) { struct btrfs_root *search_root = root; - char *dir = strdup(path_name); + char *dir = strdup(fs_name); if (!dir) { fprintf(stderr, "Ran out of memory\n"); @@ -669,7 +673,8 @@ static int search_dir(struct btrfs_root *root, struct btrfs_key *key, return -1; } loops = 0; - ret = search_dir(search_root, &location, dir); + ret = search_dir(search_root, &location, + output_rootdir, dir); free(dir); if (ret) { if (ignore_errors) @@ -911,7 +916,7 @@ int cmd_restore(int argc, char **argv) key.objectid = BTRFS_FIRST_FREE_OBJECTID; } - ret = search_dir(root, &key, dir_name); + ret = search_dir(root, &key, dir_name, ""); out: close_ctree(root); |