Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
0308af44
Commit
0308af44
authored
Jun 15, 2014
by
David Sterba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
btrfs: remove unused parameter blocksize from btrfs_find_tree_block
Signed-off-by:
David Sterba
<
dsterba@suse.cz
>
parent
ce86cd59
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
12 deletions
+9
-12
fs/btrfs/ctree.c
fs/btrfs/ctree.c
+5
-7
fs/btrfs/disk-io.c
fs/btrfs/disk-io.c
+2
-3
fs/btrfs/disk-io.h
fs/btrfs/disk-io.h
+1
-1
fs/btrfs/extent-tree.c
fs/btrfs/extent-tree.c
+1
-1
No files found.
fs/btrfs/ctree.c
View file @
0308af44
...
@@ -1683,7 +1683,7 @@ int btrfs_realloc_node(struct btrfs_trans_handle *trans,
...
@@ -1683,7 +1683,7 @@ int btrfs_realloc_node(struct btrfs_trans_handle *trans,
continue
;
continue
;
}
}
cur
=
btrfs_find_tree_block
(
root
,
blocknr
,
blocksize
);
cur
=
btrfs_find_tree_block
(
root
,
blocknr
);
if
(
cur
)
if
(
cur
)
uptodate
=
btrfs_buffer_uptodate
(
cur
,
gen
,
0
);
uptodate
=
btrfs_buffer_uptodate
(
cur
,
gen
,
0
);
else
else
...
@@ -2264,7 +2264,7 @@ static void reada_for_search(struct btrfs_root *root,
...
@@ -2264,7 +2264,7 @@ static void reada_for_search(struct btrfs_root *root,
search
=
btrfs_node_blockptr
(
node
,
slot
);
search
=
btrfs_node_blockptr
(
node
,
slot
);
blocksize
=
root
->
nodesize
;
blocksize
=
root
->
nodesize
;
eb
=
btrfs_find_tree_block
(
root
,
search
,
blocksize
);
eb
=
btrfs_find_tree_block
(
root
,
search
);
if
(
eb
)
{
if
(
eb
)
{
free_extent_buffer
(
eb
);
free_extent_buffer
(
eb
);
return
;
return
;
...
@@ -2326,7 +2326,7 @@ static noinline void reada_for_balance(struct btrfs_root *root,
...
@@ -2326,7 +2326,7 @@ static noinline void reada_for_balance(struct btrfs_root *root,
if
(
slot
>
0
)
{
if
(
slot
>
0
)
{
block1
=
btrfs_node_blockptr
(
parent
,
slot
-
1
);
block1
=
btrfs_node_blockptr
(
parent
,
slot
-
1
);
gen
=
btrfs_node_ptr_generation
(
parent
,
slot
-
1
);
gen
=
btrfs_node_ptr_generation
(
parent
,
slot
-
1
);
eb
=
btrfs_find_tree_block
(
root
,
block1
,
blocksize
);
eb
=
btrfs_find_tree_block
(
root
,
block1
);
/*
/*
* if we get -eagain from btrfs_buffer_uptodate, we
* if we get -eagain from btrfs_buffer_uptodate, we
* don't want to return eagain here. That will loop
* don't want to return eagain here. That will loop
...
@@ -2339,7 +2339,7 @@ static noinline void reada_for_balance(struct btrfs_root *root,
...
@@ -2339,7 +2339,7 @@ static noinline void reada_for_balance(struct btrfs_root *root,
if
(
slot
+
1
<
nritems
)
{
if
(
slot
+
1
<
nritems
)
{
block2
=
btrfs_node_blockptr
(
parent
,
slot
+
1
);
block2
=
btrfs_node_blockptr
(
parent
,
slot
+
1
);
gen
=
btrfs_node_ptr_generation
(
parent
,
slot
+
1
);
gen
=
btrfs_node_ptr_generation
(
parent
,
slot
+
1
);
eb
=
btrfs_find_tree_block
(
root
,
block2
,
blocksize
);
eb
=
btrfs_find_tree_block
(
root
,
block2
);
if
(
eb
&&
btrfs_buffer_uptodate
(
eb
,
gen
,
1
)
!=
0
)
if
(
eb
&&
btrfs_buffer_uptodate
(
eb
,
gen
,
1
)
!=
0
)
block2
=
0
;
block2
=
0
;
free_extent_buffer
(
eb
);
free_extent_buffer
(
eb
);
...
@@ -2450,16 +2450,14 @@ read_block_for_search(struct btrfs_trans_handle *trans,
...
@@ -2450,16 +2450,14 @@ read_block_for_search(struct btrfs_trans_handle *trans,
{
{
u64
blocknr
;
u64
blocknr
;
u64
gen
;
u64
gen
;
u32
blocksize
;
struct
extent_buffer
*
b
=
*
eb_ret
;
struct
extent_buffer
*
b
=
*
eb_ret
;
struct
extent_buffer
*
tmp
;
struct
extent_buffer
*
tmp
;
int
ret
;
int
ret
;
blocknr
=
btrfs_node_blockptr
(
b
,
slot
);
blocknr
=
btrfs_node_blockptr
(
b
,
slot
);
gen
=
btrfs_node_ptr_generation
(
b
,
slot
);
gen
=
btrfs_node_ptr_generation
(
b
,
slot
);
blocksize
=
root
->
nodesize
;
tmp
=
btrfs_find_tree_block
(
root
,
blocknr
,
blocksize
);
tmp
=
btrfs_find_tree_block
(
root
,
blocknr
);
if
(
tmp
)
{
if
(
tmp
)
{
/* first we do an atomic uptodate check */
/* first we do an atomic uptodate check */
if
(
btrfs_buffer_uptodate
(
tmp
,
gen
,
1
)
>
0
)
{
if
(
btrfs_buffer_uptodate
(
tmp
,
gen
,
1
)
>
0
)
{
...
...
fs/btrfs/disk-io.c
View file @
0308af44
...
@@ -1108,7 +1108,7 @@ int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr, u32 blocksize,
...
@@ -1108,7 +1108,7 @@ int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr, u32 blocksize,
}
}
struct
extent_buffer
*
btrfs_find_tree_block
(
struct
btrfs_root
*
root
,
struct
extent_buffer
*
btrfs_find_tree_block
(
struct
btrfs_root
*
root
,
u64
bytenr
,
u32
blocksize
)
u64
bytenr
)
{
{
return
find_extent_buffer
(
root
->
fs_info
,
bytenr
);
return
find_extent_buffer
(
root
->
fs_info
,
bytenr
);
}
}
...
@@ -4002,8 +4002,7 @@ static int btrfs_destroy_marked_extents(struct btrfs_root *root,
...
@@ -4002,8 +4002,7 @@ static int btrfs_destroy_marked_extents(struct btrfs_root *root,
clear_extent_bits
(
dirty_pages
,
start
,
end
,
mark
,
GFP_NOFS
);
clear_extent_bits
(
dirty_pages
,
start
,
end
,
mark
,
GFP_NOFS
);
while
(
start
<=
end
)
{
while
(
start
<=
end
)
{
eb
=
btrfs_find_tree_block
(
root
,
start
,
eb
=
btrfs_find_tree_block
(
root
,
start
);
root
->
nodesize
);
start
+=
root
->
nodesize
;
start
+=
root
->
nodesize
;
if
(
!
eb
)
if
(
!
eb
)
continue
;
continue
;
...
...
fs/btrfs/disk-io.h
View file @
0308af44
...
@@ -62,7 +62,7 @@ int write_ctree_super(struct btrfs_trans_handle *trans,
...
@@ -62,7 +62,7 @@ int write_ctree_super(struct btrfs_trans_handle *trans,
struct
buffer_head
*
btrfs_read_dev_super
(
struct
block_device
*
bdev
);
struct
buffer_head
*
btrfs_read_dev_super
(
struct
block_device
*
bdev
);
int
btrfs_commit_super
(
struct
btrfs_root
*
root
);
int
btrfs_commit_super
(
struct
btrfs_root
*
root
);
struct
extent_buffer
*
btrfs_find_tree_block
(
struct
btrfs_root
*
root
,
struct
extent_buffer
*
btrfs_find_tree_block
(
struct
btrfs_root
*
root
,
u64
bytenr
,
u32
blocksize
);
u64
bytenr
);
struct
btrfs_root
*
btrfs_read_fs_root
(
struct
btrfs_root
*
tree_root
,
struct
btrfs_root
*
btrfs_read_fs_root
(
struct
btrfs_root
*
tree_root
,
struct
btrfs_key
*
location
);
struct
btrfs_key
*
location
);
int
btrfs_init_fs_root
(
struct
btrfs_root
*
root
);
int
btrfs_init_fs_root
(
struct
btrfs_root
*
root
);
...
...
fs/btrfs/extent-tree.c
View file @
0308af44
...
@@ -7825,7 +7825,7 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans,
...
@@ -7825,7 +7825,7 @@ static noinline int do_walk_down(struct btrfs_trans_handle *trans,
bytenr
=
btrfs_node_blockptr
(
path
->
nodes
[
level
],
path
->
slots
[
level
]);
bytenr
=
btrfs_node_blockptr
(
path
->
nodes
[
level
],
path
->
slots
[
level
]);
blocksize
=
root
->
nodesize
;
blocksize
=
root
->
nodesize
;
next
=
btrfs_find_tree_block
(
root
,
bytenr
,
blocksize
);
next
=
btrfs_find_tree_block
(
root
,
bytenr
);
if
(
!
next
)
{
if
(
!
next
)
{
next
=
btrfs_find_create_tree_block
(
root
,
bytenr
,
blocksize
);
next
=
btrfs_find_create_tree_block
(
root
,
bytenr
,
blocksize
);
if
(
!
next
)
if
(
!
next
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment