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
2755a0de
Commit
2755a0de
authored
Jul 31, 2014
by
David Sterba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
btrfs: hide typecast to definition of BTRFS_SEND_TRANS_STUB
Signed-off-by:
David Sterba
<
dsterba@suse.cz
>
parent
94404e82
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
5 deletions
+4
-5
fs/btrfs/disk-io.c
fs/btrfs/disk-io.c
+1
-2
fs/btrfs/send.c
fs/btrfs/send.c
+1
-1
fs/btrfs/transaction.c
fs/btrfs/transaction.c
+1
-1
fs/btrfs/transaction.h
fs/btrfs/transaction.h
+1
-1
No files found.
fs/btrfs/disk-io.c
View file @
2755a0de
...
@@ -347,8 +347,7 @@ static int verify_parent_transid(struct extent_io_tree *io_tree,
...
@@ -347,8 +347,7 @@ static int verify_parent_transid(struct extent_io_tree *io_tree,
{
{
struct
extent_state
*
cached_state
=
NULL
;
struct
extent_state
*
cached_state
=
NULL
;
int
ret
;
int
ret
;
bool
need_lock
=
(
current
->
journal_info
==
bool
need_lock
=
(
current
->
journal_info
==
BTRFS_SEND_TRANS_STUB
);
(
void
*
)
BTRFS_SEND_TRANS_STUB
);
if
(
!
parent_transid
||
btrfs_header_generation
(
eb
)
==
parent_transid
)
if
(
!
parent_transid
||
btrfs_header_generation
(
eb
)
==
parent_transid
)
return
0
;
return
0
;
...
...
fs/btrfs/send.c
View file @
2755a0de
...
@@ -5728,7 +5728,7 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_)
...
@@ -5728,7 +5728,7 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_)
NULL
);
NULL
);
sort_clone_roots
=
1
;
sort_clone_roots
=
1
;
current
->
journal_info
=
(
void
*
)
BTRFS_SEND_TRANS_STUB
;
current
->
journal_info
=
BTRFS_SEND_TRANS_STUB
;
ret
=
send_subvol
(
sctx
);
ret
=
send_subvol
(
sctx
);
current
->
journal_info
=
NULL
;
current
->
journal_info
=
NULL
;
if
(
ret
<
0
)
if
(
ret
<
0
)
...
...
fs/btrfs/transaction.c
View file @
2755a0de
...
@@ -386,7 +386,7 @@ start_transaction(struct btrfs_root *root, u64 num_items, unsigned int type,
...
@@ -386,7 +386,7 @@ start_transaction(struct btrfs_root *root, u64 num_items, unsigned int type,
int
ret
;
int
ret
;
/* Send isn't supposed to start transactions. */
/* Send isn't supposed to start transactions. */
ASSERT
(
current
->
journal_info
!=
(
void
*
)
BTRFS_SEND_TRANS_STUB
);
ASSERT
(
current
->
journal_info
!=
BTRFS_SEND_TRANS_STUB
);
if
(
test_bit
(
BTRFS_FS_STATE_ERROR
,
&
root
->
fs_info
->
fs_state
))
if
(
test_bit
(
BTRFS_FS_STATE_ERROR
,
&
root
->
fs_info
->
fs_state
))
return
ERR_PTR
(
-
EROFS
);
return
ERR_PTR
(
-
EROFS
);
...
...
fs/btrfs/transaction.h
View file @
2755a0de
...
@@ -79,7 +79,7 @@ struct btrfs_transaction {
...
@@ -79,7 +79,7 @@ struct btrfs_transaction {
#define TRANS_EXTWRITERS (__TRANS_USERSPACE | __TRANS_START | \
#define TRANS_EXTWRITERS (__TRANS_USERSPACE | __TRANS_START | \
__TRANS_ATTACH)
__TRANS_ATTACH)
#define BTRFS_SEND_TRANS_STUB
1
#define BTRFS_SEND_TRANS_STUB
((void *)1)
struct
btrfs_trans_handle
{
struct
btrfs_trans_handle
{
u64
transid
;
u64
transid
;
...
...
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