Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Linux-御风守护者
linux
提交
3685f791
L
linux
项目概览
Linux-御风守护者
/
linux
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3685f791
编写于
10月 19, 2007
作者:
C
Chris Mason
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Btrfs: CPU usage optimizations in push and the extent_map code
Signed-off-by:
N
Chris Mason
<
chris.mason@oracle.com
>
上级
59d169e2
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
39 addition
and
50 deletion
+39
-50
fs/btrfs/ctree.c
fs/btrfs/ctree.c
+24
-20
fs/btrfs/extent_map.c
fs/btrfs/extent_map.c
+15
-30
未找到文件。
fs/btrfs/ctree.c
浏览文件 @
3685f791
...
...
@@ -1588,6 +1588,11 @@ static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_root
if
(
!
path
->
nodes
[
1
])
return
1
;
right_nritems
=
btrfs_header_nritems
(
right
);
if
(
right_nritems
==
0
)
{
return
1
;
}
left
=
read_tree_block
(
root
,
btrfs_node_blockptr
(
path
->
nodes
[
1
],
slot
-
1
),
root
->
leafsize
);
free_space
=
btrfs_leaf_free_space
(
root
,
left
);
...
...
@@ -1604,18 +1609,13 @@ static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_root
free_extent_buffer
(
left
);
return
1
;
}
free_space
=
btrfs_leaf_free_space
(
root
,
left
);
if
(
free_space
<
data_size
+
sizeof
(
struct
btrfs_item
))
{
free_extent_buffer
(
left
);
return
1
;
}
right_nritems
=
btrfs_header_nritems
(
right
);
if
(
right_nritems
==
0
)
{
free_extent_buffer
(
left
);
return
1
;
}
for
(
i
=
0
;
i
<
right_nritems
-
1
;
i
++
)
{
item
=
btrfs_item_nr
(
right
,
i
);
if
(
!
right
->
map_token
)
{
...
...
@@ -1772,21 +1772,25 @@ static int split_leaf(struct btrfs_trans_handle *trans, struct btrfs_root
struct
btrfs_disk_key
disk_key
;
/* first try to make some room by pushing left and right */
wret
=
push_leaf_left
(
trans
,
root
,
path
,
data_size
);
if
(
wret
<
0
)
{
return
wret
;
}
if
(
wret
)
{
if
(
ins_key
->
type
!=
BTRFS_DIR_ITEM_KEY
)
{
wret
=
push_leaf_right
(
trans
,
root
,
path
,
data_size
);
if
(
wret
<
0
)
if
(
wret
<
0
)
{
return
wret
;
}
l
=
path
->
nodes
[
0
];
}
if
(
wret
)
{
wret
=
push_leaf_left
(
trans
,
root
,
path
,
data_size
);
if
(
wret
<
0
)
return
wret
;
}
l
=
path
->
nodes
[
0
];
/* did the pushes work? */
if
(
btrfs_leaf_free_space
(
root
,
l
)
>=
sizeof
(
struct
btrfs_item
)
+
data_size
)
{
return
0
;
/* did the pushes work? */
if
(
btrfs_leaf_free_space
(
root
,
l
)
>=
sizeof
(
struct
btrfs_item
)
+
data_size
)
{
return
0
;
}
}
else
{
l
=
path
->
nodes
[
0
];
}
if
(
!
path
->
nodes
[
1
])
{
...
...
@@ -2388,13 +2392,13 @@ int btrfs_del_item(struct btrfs_trans_handle *trans, struct btrfs_root *root,
slot
=
path
->
slots
[
1
];
extent_buffer_get
(
leaf
);
wret
=
push_leaf_
lef
t
(
trans
,
root
,
path
,
1
);
wret
=
push_leaf_
righ
t
(
trans
,
root
,
path
,
1
);
if
(
wret
<
0
&&
wret
!=
-
ENOSPC
)
ret
=
wret
;
if
(
path
->
nodes
[
0
]
==
leaf
&&
btrfs_header_nritems
(
leaf
))
{
wret
=
push_leaf_
righ
t
(
trans
,
root
,
path
,
1
);
wret
=
push_leaf_
lef
t
(
trans
,
root
,
path
,
1
);
if
(
wret
<
0
&&
wret
!=
-
ENOSPC
)
ret
=
wret
;
}
...
...
fs/btrfs/extent_map.c
浏览文件 @
3685f791
...
...
@@ -1986,12 +1986,15 @@ static inline struct page *extent_buffer_page(struct extent_buffer *eb,
unsigned
long
i
)
{
struct
page
*
p
;
struct
address_space
*
mapping
;
if
(
i
==
0
)
return
eb
->
first_page
;
i
+=
eb
->
start
>>
PAGE_CACHE_SHIFT
;
p
=
find_get_page
(
eb
->
first_page
->
mapping
,
i
);
page_cache_release
(
p
);
mapping
=
eb
->
first_page
->
mapping
;
read_lock_irq
(
&
mapping
->
tree_lock
);
p
=
radix_tree_lookup
(
&
mapping
->
page_tree
,
i
);
read_unlock_irq
(
&
mapping
->
tree_lock
);
return
p
;
}
...
...
@@ -2365,9 +2368,7 @@ void read_extent_buffer(struct extent_buffer *eb, void *dstv,
WARN_ON
(
start
>
eb
->
len
);
WARN_ON
(
start
+
len
>
eb
->
start
+
eb
->
len
);
offset
=
start
&
((
unsigned
long
)
PAGE_CACHE_SIZE
-
1
);
if
(
i
==
0
)
offset
+=
start_offset
;
offset
=
(
start_offset
+
start
)
&
((
unsigned
long
)
PAGE_CACHE_SIZE
-
1
);
while
(
len
>
0
)
{
page
=
extent_buffer_page
(
eb
,
i
);
...
...
@@ -2475,9 +2476,7 @@ int memcmp_extent_buffer(struct extent_buffer *eb, const void *ptrv,
WARN_ON
(
start
>
eb
->
len
);
WARN_ON
(
start
+
len
>
eb
->
start
+
eb
->
len
);
offset
=
start
&
((
unsigned
long
)
PAGE_CACHE_SIZE
-
1
);
if
(
i
==
0
)
offset
+=
start_offset
;
offset
=
(
start_offset
+
start
)
&
((
unsigned
long
)
PAGE_CACHE_SIZE
-
1
);
while
(
len
>
0
)
{
page
=
extent_buffer_page
(
eb
,
i
);
...
...
@@ -2514,9 +2513,7 @@ void write_extent_buffer(struct extent_buffer *eb, const void *srcv,
WARN_ON
(
start
>
eb
->
len
);
WARN_ON
(
start
+
len
>
eb
->
start
+
eb
->
len
);
offset
=
start
&
((
unsigned
long
)
PAGE_CACHE_SIZE
-
1
);
if
(
i
==
0
)
offset
+=
start_offset
;
offset
=
(
start_offset
+
start
)
&
((
unsigned
long
)
PAGE_CACHE_SIZE
-
1
);
while
(
len
>
0
)
{
page
=
extent_buffer_page
(
eb
,
i
);
...
...
@@ -2548,9 +2545,7 @@ void memset_extent_buffer(struct extent_buffer *eb, char c,
WARN_ON
(
start
>
eb
->
len
);
WARN_ON
(
start
+
len
>
eb
->
start
+
eb
->
len
);
offset
=
start
&
((
unsigned
long
)
PAGE_CACHE_SIZE
-
1
);
if
(
i
==
0
)
offset
+=
start_offset
;
offset
=
(
start_offset
+
start
)
&
((
unsigned
long
)
PAGE_CACHE_SIZE
-
1
);
while
(
len
>
0
)
{
page
=
extent_buffer_page
(
eb
,
i
);
...
...
@@ -2582,9 +2577,8 @@ void copy_extent_buffer(struct extent_buffer *dst, struct extent_buffer *src,
WARN_ON
(
src
->
len
!=
dst_len
);
offset
=
dst_offset
&
((
unsigned
long
)
PAGE_CACHE_SIZE
-
1
);
if
(
i
==
0
)
offset
+=
start_offset
;
offset
=
(
start_offset
+
dst_offset
)
&
((
unsigned
long
)
PAGE_CACHE_SIZE
-
1
);
while
(
len
>
0
)
{
page
=
extent_buffer_page
(
dst
,
i
);
...
...
@@ -2664,19 +2658,14 @@ void memcpy_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
}
while
(
len
>
0
)
{
dst_off_in_page
=
dst_offset
&
dst_off_in_page
=
(
start_offset
+
dst_offset
)
&
((
unsigned
long
)
PAGE_CACHE_SIZE
-
1
);
src_off_in_page
=
src_offset
&
src_off_in_page
=
(
start_offset
+
src_offset
)
&
((
unsigned
long
)
PAGE_CACHE_SIZE
-
1
);
dst_i
=
(
start_offset
+
dst_offset
)
>>
PAGE_CACHE_SHIFT
;
src_i
=
(
start_offset
+
src_offset
)
>>
PAGE_CACHE_SHIFT
;
if
(
src_i
==
0
)
src_off_in_page
+=
start_offset
;
if
(
dst_i
==
0
)
dst_off_in_page
+=
start_offset
;
cur
=
min
(
len
,
(
unsigned
long
)(
PAGE_CACHE_SIZE
-
src_off_in_page
));
cur
=
min_t
(
unsigned
long
,
cur
,
...
...
@@ -2723,14 +2712,10 @@ void memmove_extent_buffer(struct extent_buffer *dst, unsigned long dst_offset,
dst_i
=
(
start_offset
+
dst_end
)
>>
PAGE_CACHE_SHIFT
;
src_i
=
(
start_offset
+
src_end
)
>>
PAGE_CACHE_SHIFT
;
dst_off_in_page
=
dst_end
&
dst_off_in_page
=
(
start_offset
+
dst_end
)
&
((
unsigned
long
)
PAGE_CACHE_SIZE
-
1
);
src_off_in_page
=
src_end
&
src_off_in_page
=
(
start_offset
+
src_end
)
&
((
unsigned
long
)
PAGE_CACHE_SIZE
-
1
);
if
(
src_i
==
0
)
src_off_in_page
+=
start_offset
;
if
(
dst_i
==
0
)
dst_off_in_page
+=
start_offset
;
cur
=
min_t
(
unsigned
long
,
len
,
src_off_in_page
+
1
);
cur
=
min
(
cur
,
dst_off_in_page
+
1
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录