Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
09be207d
L
linux
项目概览
xiphi1978
/
linux
通知
2
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,发现更多精彩内容 >>
提交
09be207d
编写于
11月 07, 2007
作者:
C
Chris Mason
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Btrfs: Fix failure cleanups when allocating extent buffers fail
Signed-off-by:
N
Chris Mason
<
chris.mason@oracle.com
>
上级
0da5468f
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
30 addition
and
26 deletion
+30
-26
fs/btrfs/extent_map.c
fs/btrfs/extent_map.c
+30
-26
未找到文件。
fs/btrfs/extent_map.c
浏览文件 @
09be207d
...
...
@@ -2106,25 +2106,17 @@ static struct extent_buffer *__alloc_extent_buffer(struct extent_map_tree *tree,
spin_lock
(
&
tree
->
lru_lock
);
eb
=
find_lru
(
tree
,
start
,
len
);
if
(
eb
)
{
goto
lru_add
;
}
spin_unlock
(
&
tree
->
lru_lock
);
if
(
eb
)
{
memset
(
eb
,
0
,
sizeof
(
*
eb
));
}
else
{
eb
=
kmem_cache_zalloc
(
extent_buffer_cache
,
mask
);
return
eb
;
}
eb
=
kmem_cache_zalloc
(
extent_buffer_cache
,
mask
);
INIT_LIST_HEAD
(
&
eb
->
lru
);
eb
->
start
=
start
;
eb
->
len
=
len
;
atomic_set
(
&
eb
->
refs
,
1
);
spin_lock
(
&
tree
->
lru_lock
);
lru_add:
add_lru
(
tree
,
eb
);
spin_unlock
(
&
tree
->
lru_lock
);
return
eb
;
}
...
...
@@ -2151,7 +2143,7 @@ struct extent_buffer *alloc_extent_buffer(struct extent_map_tree *tree,
return
NULL
;
if
(
eb
->
flags
&
EXTENT_BUFFER_FILLED
)
return
eb
;
goto
lru_add
;
if
(
page0
)
{
eb
->
first_page
=
page0
;
...
...
@@ -2169,11 +2161,6 @@ struct extent_buffer *alloc_extent_buffer(struct extent_map_tree *tree,
p
=
find_or_create_page
(
mapping
,
index
,
mask
|
__GFP_HIGHMEM
);
if
(
!
p
)
{
WARN_ON
(
1
);
/* make sure the free only frees the pages we've
* grabbed a reference on
*/
eb
->
len
=
i
<<
PAGE_CACHE_SHIFT
;
eb
->
start
&=
~
((
u64
)
PAGE_CACHE_SIZE
-
1
);
goto
fail
;
}
set_page_extent_mapped
(
p
);
...
...
@@ -2192,9 +2179,20 @@ struct extent_buffer *alloc_extent_buffer(struct extent_map_tree *tree,
if
(
uptodate
)
eb
->
flags
|=
EXTENT_UPTODATE
;
eb
->
flags
|=
EXTENT_BUFFER_FILLED
;
lru_add:
spin_lock
(
&
tree
->
lru_lock
);
add_lru
(
tree
,
eb
);
spin_unlock
(
&
tree
->
lru_lock
);
return
eb
;
fail:
free_extent_buffer
(
eb
);
if
(
!
atomic_dec_and_test
(
&
eb
->
refs
))
return
NULL
;
for
(
index
=
0
;
index
<
i
;
index
++
)
{
page_cache_release
(
extent_buffer_page
(
eb
,
index
));
}
__free_extent_buffer
(
eb
);
return
NULL
;
}
EXPORT_SYMBOL
(
alloc_extent_buffer
);
...
...
@@ -2204,7 +2202,8 @@ struct extent_buffer *find_extent_buffer(struct extent_map_tree *tree,
gfp_t
mask
)
{
unsigned
long
num_pages
=
num_extent_pages
(
start
,
len
);
unsigned
long
i
;
unsigned
long
index
=
start
>>
PAGE_CACHE_SHIFT
;
unsigned
long
i
;
unsigned
long
index
=
start
>>
PAGE_CACHE_SHIFT
;
struct
extent_buffer
*
eb
;
struct
page
*
p
;
struct
address_space
*
mapping
=
tree
->
mapping
;
...
...
@@ -2215,16 +2214,11 @@ struct extent_buffer *find_extent_buffer(struct extent_map_tree *tree,
return
NULL
;
if
(
eb
->
flags
&
EXTENT_BUFFER_FILLED
)
return
eb
;
goto
lru_add
;
for
(
i
=
0
;
i
<
num_pages
;
i
++
,
index
++
)
{
p
=
find_lock_page
(
mapping
,
index
);
if
(
!
p
)
{
/* make sure the free only frees the pages we've
* grabbed a reference on
*/
eb
->
len
=
i
<<
PAGE_CACHE_SHIFT
;
eb
->
start
&=
~
((
u64
)
PAGE_CACHE_SIZE
-
1
);
goto
fail
;
}
set_page_extent_mapped
(
p
);
...
...
@@ -2245,9 +2239,19 @@ struct extent_buffer *find_extent_buffer(struct extent_map_tree *tree,
if
(
uptodate
)
eb
->
flags
|=
EXTENT_UPTODATE
;
eb
->
flags
|=
EXTENT_BUFFER_FILLED
;
lru_add:
spin_lock
(
&
tree
->
lru_lock
);
add_lru
(
tree
,
eb
);
spin_unlock
(
&
tree
->
lru_lock
);
return
eb
;
fail:
free_extent_buffer
(
eb
);
if
(
!
atomic_dec_and_test
(
&
eb
->
refs
))
return
NULL
;
for
(
index
=
0
;
index
<
i
;
index
++
)
{
page_cache_release
(
extent_buffer_page
(
eb
,
index
));
}
__free_extent_buffer
(
eb
);
return
NULL
;
}
EXPORT_SYMBOL
(
find_extent_buffer
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录