Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
raspberrypi-kernel
提交
0308af44
R
raspberrypi-kernel
项目概览
openeuler
/
raspberrypi-kernel
通知
13
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
raspberrypi-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
0308af44
编写于
6月 15, 2014
作者:
D
David Sterba
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
btrfs: remove unused parameter blocksize from btrfs_find_tree_block
Signed-off-by:
N
David Sterba
<
dsterba@suse.cz
>
上级
ce86cd59
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
9 addition
and
12 deletion
+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
未找到文件。
fs/btrfs/ctree.c
浏览文件 @
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
浏览文件 @
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
浏览文件 @
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
浏览文件 @
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
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录