btrfs: hide typecast to definition of BTRFS_SEND_TRANS_STUB

Signed-off-by: David Sterba <dsterba@suse.cz>
(cherry picked from commit 2755a0de64693501741fb3603cd8ca928b0b7e81)

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 3c635024604e401950b13807b863c07ec2a93c60..f7a4e9eb1200095ead67921c6be4d51116e4fb8f 100644 (file)
--- 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,
 {
        struct extent_state *cached_state = NULL;
        int ret;
-       bool need_lock = (current->journal_info ==
-                         (void *)BTRFS_SEND_TRANS_STUB);
+       bool need_lock = (current->journal_info == BTRFS_SEND_TRANS_STUB);
 
        if (!parent_transid || btrfs_header_generation(eb) == parent_transid)
                return 0;

diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index 7edfc7cebda409d5f76b342591498dbe93d75cac..8b44630f4abffeff6688f9d54173b510c4374c0b 100644 (file)
--- 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_)
                        NULL);
        sort_clone_roots = 1;
 
-       current->journal_info = (void *)BTRFS_SEND_TRANS_STUB;
+       current->journal_info = BTRFS_SEND_TRANS_STUB;
        ret = send_subvol(sctx);
        current->journal_info = NULL;
        if (ret < 0)

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 9a1321885eee8b52e88969e6f7553c3d5e38712e..406fdd7fb4df667d0a9c6123da0efc0c34e29660 100644 (file)
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -387,7 +387,7 @@ start_transaction(struct btrfs_root *root, u64 num_items, unsigned int type,
        int ret;
 
        /* 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))
                return ERR_PTR(-EROFS);

diff --git a/fs/btrfs/transaction.h b/fs/btrfs/transaction.h
index 25bd9abc60e63866c414dbe50b862e25faa23635..1ba9c3e041914f8a91ea9491916f662d579c570f 100644 (file)
--- a/fs/btrfs/transaction.h
+++ b/fs/btrfs/transaction.h
@@ -80,7 +80,7 @@ struct btrfs_transaction {
 #define TRANS_EXTWRITERS       (__TRANS_USERSPACE | __TRANS_START |    \
                                 __TRANS_ATTACH)
 
-#define BTRFS_SEND_TRANS_STUB  1
+#define BTRFS_SEND_TRANS_STUB  ((void *)1)
 
 struct btrfs_trans_handle {
        u64 transid;