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

Commit 5a0f4e2c authored by Filipe David Borba Manana's avatar Filipe David Borba Manana Committed by Chris Mason
Browse files

Btrfs: fix pass of transid with wrong endianness in send.c 



fs/btrfs/send.c:2190:9: warning: incorrect type in argument 3 (different base types)
fs/btrfs/send.c:2190:9:    expected unsigned long long [unsigned] [usertype] value
fs/btrfs/send.c:2190:9:    got restricted __le64 [usertype] ctransid
fs/btrfs/send.c:2195:17: warning: incorrect type in argument 3 (different base types)
fs/btrfs/send.c:2195:17:    expected unsigned long long [unsigned] [usertype] value
fs/btrfs/send.c:2195:17:    got restricted __le64 [usertype] ctransid
fs/btrfs/send.c:3716:9: warning: incorrect type in argument 3 (different base types)
fs/btrfs/send.c:3716:9:    expected unsigned long long [unsigned] [usertype] value
fs/btrfs/send.c:3716:9:    got restricted __le64 [usertype] ctransid

Signed-off-by: default avatarFilipe David Borba Manana <fdmanana@gmail.com>
Signed-off-by: default avatarJosef Bacik <jbacik@fb.com>
Signed-off-by: default avatarChris Mason <clm@fb.com>
parent d527afe1

fs/btrfs/send.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -2188,12 +2188,12 @@ static int send_subvol_begin(struct send_ctx *sctx) 
	TLV_PUT_UUID(sctx, BTRFS_SEND_A_UUID,

	TLV_PUT_UUID(sctx, BTRFS_SEND_A_UUID,

			sctx->send_root->root_item.uuid);

			sctx->send_root->root_item.uuid);

	TLV_PUT_U64(sctx, BTRFS_SEND_A_CTRANSID,

	TLV_PUT_U64(sctx, BTRFS_SEND_A_CTRANSID,

			sctx->send_root->root_item.ctransid);

		    le64_to_cpu(sctx->send_root->root_item.ctransid));

	if (parent_root) {

	if (parent_root) {

		TLV_PUT_UUID(sctx, BTRFS_SEND_A_CLONE_UUID,

		TLV_PUT_UUID(sctx, BTRFS_SEND_A_CLONE_UUID,

				sctx->parent_root->root_item.uuid);

				sctx->parent_root->root_item.uuid);

		TLV_PUT_U64(sctx, BTRFS_SEND_A_CLONE_CTRANSID,

		TLV_PUT_U64(sctx, BTRFS_SEND_A_CLONE_CTRANSID,

				sctx->parent_root->root_item.ctransid);

			    le64_to_cpu(sctx->parent_root->root_item.ctransid));

	}

	}





	ret = send_cmd(sctx);

	ret = send_cmd(sctx);
@@ -3714,7 +3714,7 @@ verbose_printk("btrfs: send_clone offset=%llu, len=%d, clone_root=%llu, " 
	TLV_PUT_UUID(sctx, BTRFS_SEND_A_CLONE_UUID,

	TLV_PUT_UUID(sctx, BTRFS_SEND_A_CLONE_UUID,

			clone_root->root->root_item.uuid);

			clone_root->root->root_item.uuid);

	TLV_PUT_U64(sctx, BTRFS_SEND_A_CLONE_CTRANSID,

	TLV_PUT_U64(sctx, BTRFS_SEND_A_CLONE_CTRANSID,

			clone_root->root->root_item.ctransid);

		    le64_to_cpu(clone_root->root->root_item.ctransid));

	TLV_PUT_PATH(sctx, BTRFS_SEND_A_CLONE_PATH, p);

	TLV_PUT_PATH(sctx, BTRFS_SEND_A_CLONE_PATH, p);

	TLV_PUT_U64(sctx, BTRFS_SEND_A_CLONE_OFFSET,

	TLV_PUT_U64(sctx, BTRFS_SEND_A_CLONE_OFFSET,

			clone_root->offset);

			clone_root->offset);