Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FengXiao2002
Linux Imx
提交
5276aeda
L
Linux Imx
项目概览
FengXiao2002
/
Linux Imx
通知
8
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
Linux Imx
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5276aeda
编写于
6月 11, 2007
作者:
C
Chris Mason
提交者:
David Woodhouse
6月 11, 2007
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Btrfs: fix oops after block group lookup
Signed-off-by:
N
Chris Mason
<
chris.mason@oracle.com
>
上级
0cf6c620
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
21 addition
and
20 deletion
+21
-20
fs/btrfs/TODO
fs/btrfs/TODO
+0
-1
fs/btrfs/ctree.h
fs/btrfs/ctree.h
+3
-0
fs/btrfs/extent-tree.c
fs/btrfs/extent-tree.c
+16
-13
fs/btrfs/super.c
fs/btrfs/super.c
+2
-6
未找到文件。
fs/btrfs/TODO
浏览文件 @
5276aeda
...
...
@@ -16,6 +16,5 @@
* Use relocation to try and fix write errors
* Make allocator much smarter
* xattrs (directory streams for regular files)
* fsck
* Scrub & defrag
fs/btrfs/ctree.h
浏览文件 @
5276aeda
...
...
@@ -998,6 +998,9 @@ static inline void btrfs_mark_buffer_dirty(struct buffer_head *bh)
btrfs_item_offset((leaf)->items + (slot))))
/* extent-tree.c */
struct
btrfs_block_group_cache
*
btrfs_lookup_block_group
(
struct
btrfs_fs_info
*
info
,
u64
blocknr
);
struct
btrfs_block_group_cache
*
btrfs_find_block_group
(
struct
btrfs_root
*
root
,
struct
btrfs_block_group_cache
*
hint
,
u64
search_start
,
...
...
fs/btrfs/extent-tree.c
浏览文件 @
5276aeda
...
...
@@ -135,7 +135,7 @@ printk("cache block group %Lu\n", block_group->key.objectid);
return
0
;
}
st
atic
struct
btrfs_block_group_cache
*
lookup_block_group
(
struct
st
ruct
btrfs_block_group_cache
*
btrfs_
lookup_block_group
(
struct
btrfs_fs_info
*
info
,
u64
blocknr
)
{
...
...
@@ -208,7 +208,8 @@ out:
return
max
(
cache
->
last_alloc
,
search_start
);
new_group:
cache
=
lookup_block_group
(
root
->
fs_info
,
last
+
cache
->
key
.
offset
-
1
);
cache
=
btrfs_lookup_block_group
(
root
->
fs_info
,
last
+
cache
->
key
.
offset
-
1
);
if
(
!
cache
)
{
return
max
((
*
cache_ret
)
->
last_alloc
,
search_start
);
}
...
...
@@ -250,7 +251,7 @@ struct btrfs_block_group_cache *btrfs_find_block_group(struct btrfs_root *root,
if
(
search_start
)
{
struct
btrfs_block_group_cache
*
shint
;
shint
=
lookup_block_group
(
info
,
search_start
);
shint
=
btrfs_
lookup_block_group
(
info
,
search_start
);
if
(
shint
->
data
==
data
)
{
used
=
btrfs_block_group_used
(
&
shint
->
item
);
if
(
used
+
shint
->
pinned
<
...
...
@@ -576,7 +577,7 @@ static int update_block_group(struct btrfs_trans_handle *trans,
int
ret
;
while
(
total
)
{
cache
=
lookup_block_group
(
info
,
blocknr
);
cache
=
btrfs_
lookup_block_group
(
info
,
blocknr
);
if
(
!
cache
)
{
printk
(
KERN_CRIT
"blocknr %Lu lookup failed
\n
"
,
blocknr
);
...
...
@@ -677,7 +678,7 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans, struct
first
=
gang
[
0
];
for
(
i
=
0
;
i
<
ret
;
i
++
)
{
clear_radix_bit
(
pinned_radix
,
gang
[
i
]);
block_group
=
lookup_block_group
(
root
->
fs_info
,
block_group
=
btrfs_
lookup_block_group
(
root
->
fs_info
,
gang
[
i
]);
if
(
block_group
)
{
WARN_ON
(
block_group
->
pinned
==
0
);
...
...
@@ -751,7 +752,8 @@ static int pin_down_block(struct btrfs_root *root, u64 blocknr, int pending)
err
=
set_radix_bit
(
&
root
->
fs_info
->
pinned_radix
,
blocknr
);
if
(
!
err
)
{
struct
btrfs_block_group_cache
*
cache
;
cache
=
lookup_block_group
(
root
->
fs_info
,
blocknr
);
cache
=
btrfs_lookup_block_group
(
root
->
fs_info
,
blocknr
);
if
(
cache
)
cache
->
pinned
++
;
}
...
...
@@ -851,7 +853,8 @@ static int del_pending_extents(struct btrfs_trans_handle *trans, struct
for
(
i
=
0
;
i
<
ret
;
i
++
)
{
wret
=
set_radix_bit
(
pinned_radix
,
gang
[
i
]);
if
(
wret
==
0
)
{
cache
=
lookup_block_group
(
extent_root
->
fs_info
,
cache
=
btrfs_lookup_block_group
(
extent_root
->
fs_info
,
gang
[
i
]);
if
(
cache
)
cache
->
pinned
++
;
...
...
@@ -938,7 +941,7 @@ static int find_free_extent(struct btrfs_trans_handle *trans, struct btrfs_root
if
(
search_end
==
(
u64
)
-
1
)
search_end
=
btrfs_super_total_blocks
(
info
->
disk_super
);
if
(
hint_block
)
{
block_group
=
lookup_block_group
(
info
,
hint_block
);
block_group
=
btrfs_
lookup_block_group
(
info
,
hint_block
);
block_group
=
btrfs_find_block_group
(
root
,
block_group
,
hint_block
,
data
,
1
);
}
else
{
...
...
@@ -1118,7 +1121,7 @@ check_pending:
info
->
extent_tree_prealloc_nr
=
total_found
;
}
if
(
!
data
)
{
block_group
=
lookup_block_group
(
info
,
ins
->
objectid
);
block_group
=
btrfs_
lookup_block_group
(
info
,
ins
->
objectid
);
if
(
block_group
)
{
if
(
fill_prealloc
)
block_group
->
last_prealloc
=
...
...
@@ -1143,7 +1146,7 @@ new_group:
else
wrapped
=
1
;
}
block_group
=
lookup_block_group
(
info
,
search_start
);
block_group
=
btrfs_
lookup_block_group
(
info
,
search_start
);
cond_resched
();
if
(
!
full_scan
)
block_group
=
btrfs_find_block_group
(
root
,
block_group
,
...
...
fs/btrfs/super.c
浏览文件 @
5276aeda
...
...
@@ -62,7 +62,6 @@ static void btrfs_read_locked_inode(struct inode *inode)
struct
btrfs_inode_item
*
inode_item
;
struct
btrfs_root
*
root
=
BTRFS_I
(
inode
)
->
root
;
struct
btrfs_key
location
;
struct
btrfs_block_group_cache
*
alloc_group
;
u64
alloc_group_block
;
int
ret
;
...
...
@@ -95,11 +94,8 @@ static void btrfs_read_locked_inode(struct inode *inode)
inode
->
i_blocks
=
btrfs_inode_nblocks
(
inode_item
);
inode
->
i_generation
=
btrfs_inode_generation
(
inode_item
);
alloc_group_block
=
btrfs_inode_block_group
(
inode_item
);
ret
=
radix_tree_gang_lookup
(
&
root
->
fs_info
->
block_group_radix
,
(
void
**
)
&
alloc_group
,
alloc_group_block
,
1
);
BUG_ON
(
!
ret
);
BTRFS_I
(
inode
)
->
block_group
=
alloc_group
;
BTRFS_I
(
inode
)
->
block_group
=
btrfs_lookup_block_group
(
root
->
fs_info
,
alloc_group_block
);
btrfs_free_path
(
path
);
inode_item
=
NULL
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录