Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
a4f3d2c4
Commit
a4f3d2c4
authored
Feb 16, 2015
by
David Sterba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
btrfs: cleanup, reduce temporary variables in btrfs_read_roots
Signed-off-by:
David Sterba
<
dsterba@suse.cz
>
parent
6f011058
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
29 deletions
+25
-29
fs/btrfs/disk-io.c
fs/btrfs/disk-io.c
+25
-29
No files found.
fs/btrfs/disk-io.c
View file @
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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment