projects
/
platform
/
upstream
/
btrfs-progs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
btrfs-progs: mkfs: Use the whole file or block device to mkfs for rootdir
[platform/upstream/btrfs-progs.git]
/
ctree.c
diff --git
a/ctree.c
b/ctree.c
index
a5aae51
..
4fc33b1
100644
(file)
--- a/
ctree.c
+++ b/
ctree.c
@@
-650,7
+650,6
@@
struct extent_buffer *read_node_slot(struct btrfs_fs_info *fs_info,
return NULL;
return read_tree_block(fs_info, btrfs_node_blockptr(parent, slot),
return NULL;
return read_tree_block(fs_info, btrfs_node_blockptr(parent, slot),
- fs_info->nodesize,
btrfs_node_ptr_generation(parent, slot));
}
btrfs_node_ptr_generation(parent, slot));
}
@@
-968,6
+967,7
@@
static int noinline push_nodes_for_insert(struct btrfs_trans_handle *trans,
void reada_for_search(struct btrfs_root *root, struct btrfs_path *path,
int level, int slot, u64 objectid)
{
void reada_for_search(struct btrfs_root *root, struct btrfs_path *path,
int level, int slot, u64 objectid)
{
+ struct btrfs_fs_info *fs_info = root->fs_info;
struct extent_buffer *node;
struct btrfs_disk_key disk_key;
u32 nritems;
struct extent_buffer *node;
struct btrfs_disk_key disk_key;
u32 nritems;
@@
-978,7
+978,6
@@
void reada_for_search(struct btrfs_root *root, struct btrfs_path *path,
int direction = path->reada;
struct extent_buffer *eb;
u32 nr;
int direction = path->reada;
struct extent_buffer *eb;
u32 nr;
- u32 blocksize;
u32 nscan = 0;
if (level != 1)
u32 nscan = 0;
if (level != 1)
@@
-989,8
+988,7
@@
void reada_for_search(struct btrfs_root *root, struct btrfs_path *path,
node = path->nodes[level];
search = btrfs_node_blockptr(node, slot);
node = path->nodes[level];
search = btrfs_node_blockptr(node, slot);
- blocksize = root->fs_info->nodesize;
- eb = btrfs_find_tree_block(root, search, blocksize);
+ eb = btrfs_find_tree_block(fs_info, search, fs_info->nodesize);
if (eb) {
free_extent_buffer(eb);
return;
if (eb) {
free_extent_buffer(eb);
return;
@@
-1020,9
+1018,9
@@
void reada_for_search(struct btrfs_root *root, struct btrfs_path *path,
if ((search >= lowest_read && search <= highest_read) ||
(search < lowest_read && lowest_read - search <= 32768) ||
(search > highest_read && search - highest_read <= 32768)) {
if ((search >= lowest_read && search <= highest_read) ||
(search < lowest_read && lowest_read - search <= 32768) ||
(search > highest_read && search - highest_read <= 32768)) {
- readahead_tree_block(
root, search, blocksize
,
+ readahead_tree_block(
fs_info, search
,
btrfs_node_ptr_generation(node, nr));
btrfs_node_ptr_generation(node, nr));
- nread +=
block
size;
+ nread +=
fs_info->node
size;
}
nscan++;
if (path->reada < 2 && (nread > SZ_256K || nscan > 32))
}
nscan++;
if (path->reada < 2 && (nread > SZ_256K || nscan > 32))