Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
a4f3d2c4
C
clone-Linux
项目概览
gsplhtlxg
/
clone-Linux
通知
2
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
clone-Linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a4f3d2c4
编写于
2月 16, 2015
作者:
D
David Sterba
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
btrfs: cleanup, reduce temporary variables in btrfs_read_roots
Signed-off-by:
N
David Sterba
<
dsterba@suse.cz
>
上级
6f011058
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
25 addition
and
29 deletion
+25
-29
fs/btrfs/disk-io.c
fs/btrfs/disk-io.c
+25
-29
未找到文件。
fs/btrfs/disk-io.c
浏览文件 @
a4f3d2c4
...
...
@@ -2357,11 +2357,7 @@ static int btrfs_replay_log(struct btrfs_fs_info *fs_info,
static
int
btrfs_read_roots
(
struct
btrfs_fs_info
*
fs_info
,
struct
btrfs_root
*
tree_root
)
{
struct
btrfs_root
*
extent_root
;
struct
btrfs_root
*
dev_root
;
struct
btrfs_root
*
csum_root
;
struct
btrfs_root
*
quota_root
;
struct
btrfs_root
*
uuid_root
;
struct
btrfs_root
*
root
;
struct
btrfs_key
location
;
int
ret
;
...
...
@@ -2369,45 +2365,45 @@ static int btrfs_read_roots(struct btrfs_fs_info *fs_info,
location
.
type
=
BTRFS_ROOT_ITEM_KEY
;
location
.
offset
=
0
;
extent_
root
=
btrfs_read_tree_root
(
tree_root
,
&
location
);
if
(
IS_ERR
(
extent_
root
))
return
PTR_ERR
(
extent_
root
);
set_bit
(
BTRFS_ROOT_TRACK_DIRTY
,
&
extent_
root
->
state
);
fs_info
->
extent_root
=
extent_
root
;
root
=
btrfs_read_tree_root
(
tree_root
,
&
location
);
if
(
IS_ERR
(
root
))
return
PTR_ERR
(
root
);
set_bit
(
BTRFS_ROOT_TRACK_DIRTY
,
&
root
->
state
);
fs_info
->
extent_root
=
root
;
location
.
objectid
=
BTRFS_DEV_TREE_OBJECTID
;
dev_
root
=
btrfs_read_tree_root
(
tree_root
,
&
location
);
if
(
IS_ERR
(
dev_
root
))
return
PTR_ERR
(
dev_
root
);
set_bit
(
BTRFS_ROOT_TRACK_DIRTY
,
&
dev_
root
->
state
);
fs_info
->
dev_root
=
dev_
root
;
root
=
btrfs_read_tree_root
(
tree_root
,
&
location
);
if
(
IS_ERR
(
root
))
return
PTR_ERR
(
root
);
set_bit
(
BTRFS_ROOT_TRACK_DIRTY
,
&
root
->
state
);
fs_info
->
dev_root
=
root
;
btrfs_init_devices_late
(
fs_info
);
location
.
objectid
=
BTRFS_CSUM_TREE_OBJECTID
;
csum_
root
=
btrfs_read_tree_root
(
tree_root
,
&
location
);
if
(
IS_ERR
(
csum_
root
))
return
PTR_ERR
(
csum_
root
);
set_bit
(
BTRFS_ROOT_TRACK_DIRTY
,
&
csum_
root
->
state
);
fs_info
->
csum_root
=
csum_
root
;
root
=
btrfs_read_tree_root
(
tree_root
,
&
location
);
if
(
IS_ERR
(
root
))
return
PTR_ERR
(
root
);
set_bit
(
BTRFS_ROOT_TRACK_DIRTY
,
&
root
->
state
);
fs_info
->
csum_root
=
root
;
location
.
objectid
=
BTRFS_QUOTA_TREE_OBJECTID
;
quota_
root
=
btrfs_read_tree_root
(
tree_root
,
&
location
);
if
(
!
IS_ERR
(
quota_
root
))
{
set_bit
(
BTRFS_ROOT_TRACK_DIRTY
,
&
quota_
root
->
state
);
root
=
btrfs_read_tree_root
(
tree_root
,
&
location
);
if
(
!
IS_ERR
(
root
))
{
set_bit
(
BTRFS_ROOT_TRACK_DIRTY
,
&
root
->
state
);
fs_info
->
quota_enabled
=
1
;
fs_info
->
pending_quota_state
=
1
;
fs_info
->
quota_root
=
quota_
root
;
fs_info
->
quota_root
=
root
;
}
location
.
objectid
=
BTRFS_UUID_TREE_OBJECTID
;
uuid_
root
=
btrfs_read_tree_root
(
tree_root
,
&
location
);
if
(
IS_ERR
(
uuid_
root
))
{
ret
=
PTR_ERR
(
uuid_
root
);
root
=
btrfs_read_tree_root
(
tree_root
,
&
location
);
if
(
IS_ERR
(
root
))
{
ret
=
PTR_ERR
(
root
);
if
(
ret
!=
-
ENOENT
)
return
ret
;
}
else
{
set_bit
(
BTRFS_ROOT_TRACK_DIRTY
,
&
uuid_
root
->
state
);
fs_info
->
uuid_root
=
uuid_
root
;
set_bit
(
BTRFS_ROOT_TRACK_DIRTY
,
&
root
->
state
);
fs_info
->
uuid_root
=
root
;
}
return
0
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录