dev_fd = device->fd;
device->total_ios++;
dev_bytenr = multi->stripes[0].physical;
- kfree(multi);
+ free(multi);
if (size_left < length)
length = size_left;
int fd, const char *file_name)
{
struct btrfs_key key;
- struct btrfs_path *path;
+ struct btrfs_path path;
struct extent_buffer *leaf;
struct btrfs_dir_item *di;
u32 name_len = 0;
char *data = NULL;
int ret = 0;
+ btrfs_init_path(&path);
key.objectid = inode;
key.type = BTRFS_XATTR_ITEM_KEY;
key.offset = 0;
-
- path = btrfs_alloc_path();
- if (!path)
- return -ENOMEM;
-
- ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
+ ret = btrfs_search_slot(NULL, root, &key, &path, 0, 0);
if (ret < 0)
goto out;
- leaf = path->nodes[0];
+ leaf = path.nodes[0];
while (1) {
- if (path->slots[0] >= btrfs_header_nritems(leaf)) {
+ if (path.slots[0] >= btrfs_header_nritems(leaf)) {
do {
- ret = next_leaf(root, path);
+ ret = next_leaf(root, &path);
if (ret < 0) {
error("searching for extended attributes: %d\n",
ret);
ret = 0;
goto out;
}
- leaf = path->nodes[0];
+ leaf = path.nodes[0];
} while (!leaf);
continue;
}
- btrfs_item_key_to_cpu(leaf, &key, path->slots[0]);
+ btrfs_item_key_to_cpu(leaf, &key, path.slots[0]);
if (key.type != BTRFS_XATTR_ITEM_KEY || key.objectid != inode)
break;
cur = 0;
- total_len = btrfs_item_size_nr(leaf, path->slots[0]);
- di = btrfs_item_ptr(leaf, path->slots[0],
+ total_len = btrfs_item_size_nr(leaf, path.slots[0]);
+ di = btrfs_item_ptr(leaf, path.slots[0],
struct btrfs_dir_item);
while (cur < total_len) {
cur += len;
di = (struct btrfs_dir_item *)((char *)di + len);
}
- path->slots[0]++;
+ path.slots[0]++;
}
ret = 0;
out:
- btrfs_free_path(path);
+ btrfs_release_path(&path);
free(name);
free(data);
static int copy_metadata(struct btrfs_root *root, int fd,
struct btrfs_key *key)
{
- struct btrfs_path *path;
+ struct btrfs_path path;
struct btrfs_inode_item *inode_item;
int ret;
- path = btrfs_alloc_path();
- if (!path) {
- error("not enough memory");
- return -ENOMEM;
- }
-
- ret = btrfs_lookup_inode(NULL, root, path, key, 0);
+ btrfs_init_path(&path);
+ ret = btrfs_lookup_inode(NULL, root, &path, key, 0);
if (ret == 0) {
struct btrfs_timespec *bts;
struct timespec times[2];
- inode_item = btrfs_item_ptr(path->nodes[0], path->slots[0],
+ inode_item = btrfs_item_ptr(path.nodes[0], path.slots[0],
struct btrfs_inode_item);
- ret = fchown(fd, btrfs_inode_uid(path->nodes[0], inode_item),
- btrfs_inode_gid(path->nodes[0], inode_item));
+ ret = fchown(fd, btrfs_inode_uid(path.nodes[0], inode_item),
+ btrfs_inode_gid(path.nodes[0], inode_item));
if (ret) {
error("failed to change owner: %s", strerror(errno));
goto out;
}
- ret = fchmod(fd, btrfs_inode_mode(path->nodes[0], inode_item));
+ ret = fchmod(fd, btrfs_inode_mode(path.nodes[0], inode_item));
if (ret) {
error("failed to change mode: %s", strerror(errno));
goto out;
}
bts = btrfs_inode_atime(inode_item);
- times[0].tv_sec = btrfs_timespec_sec(path->nodes[0], bts);
- times[0].tv_nsec = btrfs_timespec_nsec(path->nodes[0], bts);
+ times[0].tv_sec = btrfs_timespec_sec(path.nodes[0], bts);
+ times[0].tv_nsec = btrfs_timespec_nsec(path.nodes[0], bts);
bts = btrfs_inode_mtime(inode_item);
- times[1].tv_sec = btrfs_timespec_sec(path->nodes[0], bts);
- times[1].tv_nsec = btrfs_timespec_nsec(path->nodes[0], bts);
+ times[1].tv_sec = btrfs_timespec_sec(path.nodes[0], bts);
+ times[1].tv_nsec = btrfs_timespec_nsec(path.nodes[0], bts);
ret = futimens(fd, times);
if (ret) {
}
}
out:
- btrfs_free_path(path);
+ btrfs_release_path(&path);
return ret;
}
const char *file)
{
struct extent_buffer *leaf;
- struct btrfs_path *path;
+ struct btrfs_path path;
struct btrfs_file_extent_item *fi;
struct btrfs_inode_item *inode_item;
struct btrfs_timespec *bts;
struct timespec times[2];
int times_ok = 0;
- path = btrfs_alloc_path();
- if (!path) {
- error("not enough memory");
- return -ENOMEM;
- }
-
- ret = btrfs_lookup_inode(NULL, root, path, key, 0);
+ btrfs_init_path(&path);
+ ret = btrfs_lookup_inode(NULL, root, &path, key, 0);
if (ret == 0) {
- inode_item = btrfs_item_ptr(path->nodes[0], path->slots[0],
+ inode_item = btrfs_item_ptr(path.nodes[0], path.slots[0],
struct btrfs_inode_item);
- found_size = btrfs_inode_size(path->nodes[0], inode_item);
+ found_size = btrfs_inode_size(path.nodes[0], inode_item);
if (restore_metadata) {
/*
* copyout is finished.
*/
- ret = fchown(fd, btrfs_inode_uid(path->nodes[0], inode_item),
- btrfs_inode_gid(path->nodes[0], inode_item));
+ ret = fchown(fd, btrfs_inode_uid(path.nodes[0], inode_item),
+ btrfs_inode_gid(path.nodes[0], inode_item));
if (ret && !ignore_errors)
goto out;
- ret = fchmod(fd, btrfs_inode_mode(path->nodes[0], inode_item));
+ ret = fchmod(fd, btrfs_inode_mode(path.nodes[0], inode_item));
if (ret && !ignore_errors)
goto out;
bts = btrfs_inode_atime(inode_item);
- times[0].tv_sec = btrfs_timespec_sec(path->nodes[0], bts);
- times[0].tv_nsec = btrfs_timespec_nsec(path->nodes[0], bts);
+ times[0].tv_sec = btrfs_timespec_sec(path.nodes[0], bts);
+ times[0].tv_nsec = btrfs_timespec_nsec(path.nodes[0], bts);
bts = btrfs_inode_mtime(inode_item);
- times[1].tv_sec = btrfs_timespec_sec(path->nodes[0], bts);
- times[1].tv_nsec = btrfs_timespec_nsec(path->nodes[0], bts);
+ times[1].tv_sec = btrfs_timespec_sec(path.nodes[0], bts);
+ times[1].tv_nsec = btrfs_timespec_nsec(path.nodes[0], bts);
times_ok = 1;
}
}
- btrfs_release_path(path);
+ btrfs_release_path(&path);
key->offset = 0;
key->type = BTRFS_EXTENT_DATA_KEY;
- ret = btrfs_search_slot(NULL, root, key, path, 0, 0);
+ ret = btrfs_search_slot(NULL, root, key, &path, 0, 0);
if (ret < 0) {
error("searching extent data returned %d", ret);
goto out;
}
- leaf = path->nodes[0];
+ leaf = path.nodes[0];
while (!leaf) {
- ret = next_leaf(root, path);
+ ret = next_leaf(root, &path);
if (ret < 0) {
error("cannot get next leaf: %d", ret);
goto out;
ret = 0;
goto out;
}
- leaf = path->nodes[0];
+ leaf = path.nodes[0];
}
while (1) {
else if (resp == LOOP_DONTASK)
loops = -1;
}
- if (path->slots[0] >= btrfs_header_nritems(leaf)) {
+ if (path.slots[0] >= btrfs_header_nritems(leaf)) {
do {
- ret = next_leaf(root, path);
+ ret = next_leaf(root, &path);
if (ret < 0) {
fprintf(stderr, "Error searching %d\n", ret);
goto out;
} else if (ret) {
/* No more leaves to search */
- btrfs_free_path(path);
+ btrfs_release_path(&path);
goto set_size;
}
- leaf = path->nodes[0];
+ leaf = path.nodes[0];
} while (!leaf);
continue;
}
- btrfs_item_key_to_cpu(leaf, &found_key, path->slots[0]);
+ btrfs_item_key_to_cpu(leaf, &found_key, path.slots[0]);
if (found_key.objectid != key->objectid)
break;
if (found_key.type != key->type)
break;
- fi = btrfs_item_ptr(leaf, path->slots[0],
+ fi = btrfs_item_ptr(leaf, path.slots[0],
struct btrfs_file_extent_item);
extent_type = btrfs_file_extent_type(leaf, fi);
compression = btrfs_file_extent_compression(leaf, fi);
if (extent_type == BTRFS_FILE_EXTENT_PREALLOC)
goto next;
if (extent_type == BTRFS_FILE_EXTENT_INLINE) {
- ret = copy_one_inline(root, fd, path, found_key.offset);
+ ret = copy_one_inline(root, fd, &path, found_key.offset);
if (ret)
goto out;
} else if (extent_type == BTRFS_FILE_EXTENT_REG) {
warning("weird extent type %d", extent_type);
}
next:
- path->slots[0]++;
+ path.slots[0]++;
}
- btrfs_free_path(path);
+ btrfs_release_path(&path);
set_size:
if (found_size) {
ret = ftruncate(fd, (loff_t)found_size);
return 0;
out:
- btrfs_free_path(path);
+ btrfs_release_path(&path);
return ret;
}
static int copy_symlink(struct btrfs_root *root, struct btrfs_key *key,
const char *file)
{
- struct btrfs_path *path;
+ struct btrfs_path path;
struct extent_buffer *leaf;
struct btrfs_file_extent_item *extent_item;
struct btrfs_inode_item *inode_item;
}
}
+ btrfs_init_path(&path);
key->type = BTRFS_EXTENT_DATA_KEY;
key->offset = 0;
-
- path = btrfs_alloc_path();
- if (!path)
- return -ENOMEM;
-
- ret = btrfs_search_slot(NULL, root, key, path, 0, 0);
+ ret = btrfs_search_slot(NULL, root, key, &path, 0, 0);
if (ret < 0)
goto out;
- leaf = path->nodes[0];
+ leaf = path.nodes[0];
if (!leaf) {
fprintf(stderr, "Error getting leaf for symlink '%s'\n", file);
ret = -1;
goto out;
}
- extent_item = btrfs_item_ptr(leaf, path->slots[0],
+ extent_item = btrfs_item_ptr(leaf, path.slots[0],
struct btrfs_file_extent_item);
len = btrfs_file_extent_inline_item_len(leaf,
- btrfs_item_nr(path->slots[0]));
+ btrfs_item_nr(path.slots[0]));
if (len >= PATH_MAX) {
fprintf(stderr, "Symlink '%s' target length %d is longer than PATH_MAX\n",
fs_name, len);
key->type = BTRFS_INODE_ITEM_KEY;
key->offset = 0;
- btrfs_release_path(path);
+ btrfs_release_path(&path);
- ret = btrfs_lookup_inode(NULL, root, path, key, 0);
+ ret = btrfs_lookup_inode(NULL, root, &path, key, 0);
if (ret) {
fprintf(stderr, "Failed to lookup inode for '%s'\n", file);
goto out;
}
- inode_item = btrfs_item_ptr(path->nodes[0], path->slots[0],
+ inode_item = btrfs_item_ptr(path.nodes[0], path.slots[0],
struct btrfs_inode_item);
- ret = fchownat(-1, file, btrfs_inode_uid(path->nodes[0], inode_item),
- btrfs_inode_gid(path->nodes[0], inode_item),
+ ret = fchownat(-1, file, btrfs_inode_uid(path.nodes[0], inode_item),
+ btrfs_inode_gid(path.nodes[0], inode_item),
AT_SYMLINK_NOFOLLOW);
if (ret) {
fprintf(stderr, "Failed to change owner: %s\n",
}
bts = btrfs_inode_atime(inode_item);
- times[0].tv_sec = btrfs_timespec_sec(path->nodes[0], bts);
- times[0].tv_nsec = btrfs_timespec_nsec(path->nodes[0], bts);
+ times[0].tv_sec = btrfs_timespec_sec(path.nodes[0], bts);
+ times[0].tv_nsec = btrfs_timespec_nsec(path.nodes[0], bts);
bts = btrfs_inode_mtime(inode_item);
- times[1].tv_sec = btrfs_timespec_sec(path->nodes[0], bts);
- times[1].tv_nsec = btrfs_timespec_nsec(path->nodes[0], bts);
+ times[1].tv_sec = btrfs_timespec_sec(path.nodes[0], bts);
+ times[1].tv_nsec = btrfs_timespec_nsec(path.nodes[0], bts);
ret = utimensat(-1, file, times, AT_SYMLINK_NOFOLLOW);
if (ret)
fprintf(stderr, "Failed to set times: %s\n", strerror(errno));
out:
- btrfs_free_path(path);
+ btrfs_release_path(&path);
return ret;
}
const char *output_rootdir, const char *in_dir,
const regex_t *mreg)
{
- struct btrfs_path *path;
+ struct btrfs_path path;
struct extent_buffer *leaf;
struct btrfs_dir_item *dir_item;
struct btrfs_key found_key, location;
int loops = 0;
u8 type;
- path = btrfs_alloc_path();
- if (!path) {
- fprintf(stderr, "Ran out of memory\n");
- return -ENOMEM;
- }
-
+ btrfs_init_path(&path);
key->offset = 0;
key->type = BTRFS_DIR_INDEX_KEY;
-
- ret = btrfs_search_slot(NULL, root, key, path, 0, 0);
+ ret = btrfs_search_slot(NULL, root, key, &path, 0, 0);
if (ret < 0) {
fprintf(stderr, "Error searching %d\n", ret);
goto out;
ret = 0;
- leaf = path->nodes[0];
+ leaf = path.nodes[0];
while (!leaf) {
if (verbose > 1)
printf("No leaf after search, looking for the next "
"leaf\n");
- ret = next_leaf(root, path);
+ ret = next_leaf(root, &path);
if (ret < 0) {
fprintf(stderr, "Error getting next leaf %d\n",
ret);
ret = 0;
goto out;
}
- leaf = path->nodes[0];
+ leaf = path.nodes[0];
}
while (leaf) {
break;
}
- if (path->slots[0] >= btrfs_header_nritems(leaf)) {
+ if (path.slots[0] >= btrfs_header_nritems(leaf)) {
do {
- ret = next_leaf(root, path);
+ ret = next_leaf(root, &path);
if (ret < 0) {
fprintf(stderr, "Error searching %d\n",
ret);
ret = 0;
goto out;
}
- leaf = path->nodes[0];
+ leaf = path.nodes[0];
} while (!leaf);
continue;
}
- btrfs_item_key_to_cpu(leaf, &found_key, path->slots[0]);
+ btrfs_item_key_to_cpu(leaf, &found_key, path.slots[0]);
if (found_key.objectid != key->objectid) {
if (verbose > 1)
printf("Found objectid=%Lu, key=%Lu\n",
found_key.type, key->type);
break;
}
- dir_item = btrfs_item_ptr(leaf, path->slots[0],
+ dir_item = btrfs_item_ptr(leaf, path.slots[0],
struct btrfs_dir_item);
name_ptr = (unsigned long)(dir_item + 1);
name_len = btrfs_dir_name_len(leaf, dir_item);
if (ret < 0) {
if (ignore_errors)
goto next;
- btrfs_free_path(path);
+ btrfs_release_path(&path);
return ret;
}
}
next:
- path->slots[0]++;
+ path.slots[0]++;
}
if (restore_metadata) {
if (verbose)
printf("Done searching %s\n", in_dir);
out:
- btrfs_free_path(path);
+ btrfs_release_path(&path);
return ret;
}
struct btrfs_key key;
struct btrfs_key found_key;
struct btrfs_disk_key disk_key;
- struct btrfs_path *path;
+ struct btrfs_path path;
struct extent_buffer *leaf;
struct btrfs_root_item ri;
unsigned long offset;
int ret;
root = root->fs_info->tree_root;
- path = btrfs_alloc_path();
- if (!path) {
- fprintf(stderr, "Failed to alloc path\n");
- return -ENOMEM;
- }
+ btrfs_init_path(&path);
key.offset = 0;
key.objectid = 0;
key.type = BTRFS_ROOT_ITEM_KEY;
-
- ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
+ ret = btrfs_search_slot(NULL, root, &key, &path, 0, 0);
if (ret < 0) {
fprintf(stderr, "Failed to do search %d\n", ret);
- btrfs_free_path(path);
+ btrfs_release_path(&path);
return -1;
}
- leaf = path->nodes[0];
+ leaf = path.nodes[0];
while (1) {
- slot = path->slots[0];
+ slot = path.slots[0];
if (slot >= btrfs_header_nritems(leaf)) {
- ret = btrfs_next_leaf(root, path);
+ ret = btrfs_next_leaf(root, &path);
if (ret)
break;
- leaf = path->nodes[0];
- slot = path->slots[0];
+ leaf = path.nodes[0];
+ slot = path.slots[0];
}
btrfs_item_key(leaf, &disk_key, slot);
btrfs_disk_key_to_cpu(&found_key, &disk_key);
- if (btrfs_key_type(&found_key) != BTRFS_ROOT_ITEM_KEY) {
- path->slots[0]++;
+ if (found_key.type != BTRFS_ROOT_ITEM_KEY) {
+ path.slots[0]++;
continue;
}
btrfs_print_key(&disk_key);
printf(" %Lu level %d\n", btrfs_root_bytenr(&ri),
btrfs_root_level(&ri));
- path->slots[0]++;
+ path.slots[0]++;
}
- btrfs_free_path(path);
+ btrfs_release_path(&path);
return 0;
}
root_location = btrfs_super_root(fs_info->super_copy);
generation = btrfs_super_generation(fs_info->super_copy);
root->node = read_tree_block(root, root_location,
- root->leafsize, generation);
+ root->nodesize, generation);
if (!extent_buffer_uptodate(root->node)) {
fprintf(stderr, "Error opening tree root\n");
close_ctree(root);
static int find_first_dir(struct btrfs_root *root, u64 *objectid)
{
- struct btrfs_path *path;
+ struct btrfs_path path;
struct btrfs_key found_key;
struct btrfs_key key;
int ret = -1;
int i;
+ btrfs_init_path(&path);
key.objectid = 0;
key.type = BTRFS_DIR_INDEX_KEY;
key.offset = 0;
-
- path = btrfs_alloc_path();
- if (!path) {
- fprintf(stderr, "Ran out of memory\n");
- return ret;
- }
-
- ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
+ ret = btrfs_search_slot(NULL, root, &key, &path, 0, 0);
if (ret < 0) {
fprintf(stderr, "Error searching %d\n", ret);
goto out;
}
- if (!path->nodes[0]) {
+ if (!path.nodes[0]) {
fprintf(stderr, "No leaf!\n");
goto out;
}
again:
- for (i = path->slots[0];
- i < btrfs_header_nritems(path->nodes[0]); i++) {
- btrfs_item_key_to_cpu(path->nodes[0], &found_key, i);
+ for (i = path.slots[0];
+ i < btrfs_header_nritems(path.nodes[0]); i++) {
+ btrfs_item_key_to_cpu(path.nodes[0], &found_key, i);
if (found_key.type != key.type)
continue;
goto out;
}
do {
- ret = next_leaf(root, path);
+ ret = next_leaf(root, &path);
if (ret < 0) {
fprintf(stderr, "Error getting next leaf %d\n",
ret);
fprintf(stderr, "No more leaves\n");
goto out;
}
- } while (!path->nodes[0]);
- if (path->nodes[0])
+ } while (!path.nodes[0]);
+ if (path.nodes[0])
goto again;
printf("Couldn't find a dir index item\n");
out:
- btrfs_free_path(path);
+ btrfs_release_path(&path);
return ret;
}
"Try to restore files from a damaged filesystem (unmounted)",
"",
"-s|--snapshots get snapshots",
- "-x|--xattr get extended attributes",
+ "-x|--xattr restore extended attributes",
"-m|--metadata restore owner, mode and times",
- "-S|--symlinks restore symbolic links",
+ "-S|--symlink restore symbolic links",
"-v|--verbose verbose",
"-i|--ignore-errors ignore errors",
"-o|--overwrite overwrite",
while (1) {
int opt;
+ enum { GETOPT_VAL_PATH_REGEX = 256 };
static const struct option long_options[] = {
- { "path-regex", required_argument, NULL, 256},
+ { "path-regex", required_argument, NULL,
+ GETOPT_VAL_PATH_REGEX },
{ "dry-run", no_argument, NULL, 'D'},
{ "metadata", no_argument, NULL, 'm'},
{ "symlinks", no_argument, NULL, 'S'},
case 'c':
match_cflags |= REG_ICASE;
break;
- /* long option without single letter alternative */
- case 256:
+ case GETOPT_VAL_PATH_REGEX:
match_regstr = optarg;
break;
case 'x':
if (fs_location != 0) {
free_extent_buffer(root->node);
- root->node = read_tree_block(root, fs_location, root->leafsize, 0);
+ root->node = read_tree_block(root, fs_location, root->nodesize, 0);
if (!extent_buffer_uptodate(root->node)) {
fprintf(stderr, "Failed to read fs location\n");
ret = 1;
projects / platform / upstream / btrfs-progs.git / blobdiff