diff options
author | David Sterba <dsterba@suse.cz> | 2014-07-30 18:43:18 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.cz> | 2014-10-02 11:30:31 -0400 |
commit | 2755a0de64693501741fb3603cd8ca928b0b7e81 (patch) | |
tree | d9e934a9e41bf247cd6cf2095c299751fd207b77 /fs | |
parent | 94404e82e5f5452a13ef580b6d3df1483671dff9 (diff) |
btrfs: hide typecast to definition of BTRFS_SEND_TRANS_STUB
Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/btrfs/disk-io.c | 3 | ||||
-rw-r--r-- | fs/btrfs/send.c | 2 | ||||
-rw-r--r-- | fs/btrfs/transaction.c | 2 | ||||
-rw-r--r-- | fs/btrfs/transaction.h | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 2f075ef20050..0abf4b0a9010 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
@@ -347,8 +347,7 @@ static int verify_parent_transid(struct extent_io_tree *io_tree, | |||
347 | { | 347 | { |
348 | struct extent_state *cached_state = NULL; | 348 | struct extent_state *cached_state = NULL; |
349 | int ret; | 349 | int ret; |
350 | bool need_lock = (current->journal_info == | 350 | bool need_lock = (current->journal_info == BTRFS_SEND_TRANS_STUB); |
351 | (void *)BTRFS_SEND_TRANS_STUB); | ||
352 | 351 | ||
353 | if (!parent_transid || btrfs_header_generation(eb) == parent_transid) | 352 | if (!parent_transid || btrfs_header_generation(eb) == parent_transid) |
354 | return 0; | 353 | return 0; |
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index 7edfc7cebda4..8b44630f4abf 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c | |||
@@ -5728,7 +5728,7 @@ long btrfs_ioctl_send(struct file *mnt_file, void __user *arg_) | |||
5728 | NULL); | 5728 | NULL); |
5729 | sort_clone_roots = 1; | 5729 | sort_clone_roots = 1; |
5730 | 5730 | ||
5731 | current->journal_info = (void *)BTRFS_SEND_TRANS_STUB; | 5731 | current->journal_info = BTRFS_SEND_TRANS_STUB; |
5732 | ret = send_subvol(sctx); | 5732 | ret = send_subvol(sctx); |
5733 | current->journal_info = NULL; | 5733 | current->journal_info = NULL; |
5734 | if (ret < 0) | 5734 | if (ret < 0) |
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 16d0c1b62b3e..f4c194b160b7 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c | |||
@@ -386,7 +386,7 @@ start_transaction(struct btrfs_root *root, u64 num_items, unsigned int type, | |||
386 | int ret; | 386 | int ret; |
387 | 387 | ||
388 | /* Send isn't supposed to start transactions. */ | 388 | /* Send isn't supposed to start transactions. */ |
389 | ASSERT(current->journal_info != (void *)BTRFS_SEND_TRANS_STUB); | 389 | ASSERT(current->journal_info != BTRFS_SEND_TRANS_STUB); |
390 | 390 | ||
391 | if (test_bit(BTRFS_FS_STATE_ERROR, &root->fs_info->fs_state)) | 391 | if (test_bit(BTRFS_FS_STATE_ERROR, &root->fs_info->fs_state)) |
392 | return ERR_PTR(-EROFS); | 392 | return ERR_PTR(-EROFS); |
diff --git a/fs/btrfs/transaction.h b/fs/btrfs/transaction.h index 579be51b27e5..d8f40e1a5d2d 100644 --- a/fs/btrfs/transaction.h +++ b/fs/btrfs/transaction.h | |||
@@ -79,7 +79,7 @@ struct btrfs_transaction { | |||
79 | #define TRANS_EXTWRITERS (__TRANS_USERSPACE | __TRANS_START | \ | 79 | #define TRANS_EXTWRITERS (__TRANS_USERSPACE | __TRANS_START | \ |
80 | __TRANS_ATTACH) | 80 | __TRANS_ATTACH) |
81 | 81 | ||
82 | #define BTRFS_SEND_TRANS_STUB 1 | 82 | #define BTRFS_SEND_TRANS_STUB ((void *)1) |
83 | 83 | ||
84 | struct btrfs_trans_handle { | 84 | struct btrfs_trans_handle { |
85 | u64 transid; | 85 | u64 transid; |