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
19ae4e81
Commit
19ae4e81
authored
May 20, 2012
by
Jan Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Btrfs: fs_info variable for join_transaction
Signed-off-by:
Jan Schmidt
<
list.btrfs@jan-o-sch.net
>
parent
8445f61c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
18 deletions
+19
-18
fs/btrfs/transaction.c
fs/btrfs/transaction.c
+19
-18
No files found.
fs/btrfs/transaction.c
View file @
19ae4e81
...
...
@@ -55,48 +55,49 @@ static noinline void switch_commit_root(struct btrfs_root *root)
static
noinline
int
join_transaction
(
struct
btrfs_root
*
root
,
int
nofail
)
{
struct
btrfs_transaction
*
cur_trans
;
struct
btrfs_fs_info
*
fs_info
=
root
->
fs_info
;
spin_lock
(
&
root
->
fs_info
->
trans_lock
);
spin_lock
(
&
fs_info
->
trans_lock
);
loop:
/* The file system has been taken offline. No new transactions. */
if
(
root
->
fs_info
->
fs_state
&
BTRFS_SUPER_FLAG_ERROR
)
{
spin_unlock
(
&
root
->
fs_info
->
trans_lock
);
if
(
fs_info
->
fs_state
&
BTRFS_SUPER_FLAG_ERROR
)
{
spin_unlock
(
&
fs_info
->
trans_lock
);
return
-
EROFS
;
}
if
(
root
->
fs_info
->
trans_no_join
)
{
if
(
fs_info
->
trans_no_join
)
{
if
(
!
nofail
)
{
spin_unlock
(
&
root
->
fs_info
->
trans_lock
);
spin_unlock
(
&
fs_info
->
trans_lock
);
return
-
EBUSY
;
}
}
cur_trans
=
root
->
fs_info
->
running_transaction
;
cur_trans
=
fs_info
->
running_transaction
;
if
(
cur_trans
)
{
if
(
cur_trans
->
aborted
)
{
spin_unlock
(
&
root
->
fs_info
->
trans_lock
);
spin_unlock
(
&
fs_info
->
trans_lock
);
return
cur_trans
->
aborted
;
}
atomic_inc
(
&
cur_trans
->
use_count
);
atomic_inc
(
&
cur_trans
->
num_writers
);
cur_trans
->
num_joined
++
;
spin_unlock
(
&
root
->
fs_info
->
trans_lock
);
spin_unlock
(
&
fs_info
->
trans_lock
);
return
0
;
}
spin_unlock
(
&
root
->
fs_info
->
trans_lock
);
spin_unlock
(
&
fs_info
->
trans_lock
);
cur_trans
=
kmem_cache_alloc
(
btrfs_transaction_cachep
,
GFP_NOFS
);
if
(
!
cur_trans
)
return
-
ENOMEM
;
spin_lock
(
&
root
->
fs_info
->
trans_lock
);
if
(
root
->
fs_info
->
running_transaction
)
{
spin_lock
(
&
fs_info
->
trans_lock
);
if
(
fs_info
->
running_transaction
)
{
/*
* someone started a transaction after we unlocked. Make sure
* to redo the trans_no_join checks above
*/
kmem_cache_free
(
btrfs_transaction_cachep
,
cur_trans
);
cur_trans
=
root
->
fs_info
->
running_transaction
;
cur_trans
=
fs_info
->
running_transaction
;
goto
loop
;
}
...
...
@@ -127,14 +128,14 @@ static noinline int join_transaction(struct btrfs_root *root, int nofail)
INIT_LIST_HEAD
(
&
cur_trans
->
delayed_refs
.
seq_head
);
INIT_LIST_HEAD
(
&
cur_trans
->
pending_snapshots
);
list_add_tail
(
&
cur_trans
->
list
,
&
root
->
fs_info
->
trans_list
);
list_add_tail
(
&
cur_trans
->
list
,
&
fs_info
->
trans_list
);
extent_io_tree_init
(
&
cur_trans
->
dirty_pages
,
root
->
fs_info
->
btree_inode
->
i_mapping
);
root
->
fs_info
->
generation
++
;
cur_trans
->
transid
=
root
->
fs_info
->
generation
;
root
->
fs_info
->
running_transaction
=
cur_trans
;
fs_info
->
btree_inode
->
i_mapping
);
fs_info
->
generation
++
;
cur_trans
->
transid
=
fs_info
->
generation
;
fs_info
->
running_transaction
=
cur_trans
;
cur_trans
->
aborted
=
0
;
spin_unlock
(
&
root
->
fs_info
->
trans_lock
);
spin_unlock
(
&
fs_info
->
trans_lock
);
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