Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2755a0de authored by David Sterba's avatar David Sterba
Browse files

btrfs: hide typecast to definition of BTRFS_SEND_TRANS_STUB 



Signed-off-by: default avatarDavid Sterba <dsterba@suse.cz>
parent 94404e82

fs/btrfs/disk-io.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

fs/btrfs/send.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

fs/btrfs/transaction.c

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,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);

fs/btrfs/transaction.h

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,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;