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

Commit 1473b24e authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Chris Mason
Browse files

Btrfs: Make btrfs_device_fsid() return unsigned long 



All callers of btrfs_device_fsid() cast its return type to unsigned long.

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent 410ba3a2

fs/btrfs/ctree.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -2169,9 +2169,9 @@ static inline unsigned long btrfs_device_uuid(struct btrfs_dev_item *d) 
	return (unsigned long)d + offsetof(struct btrfs_dev_item, uuid);

	return (unsigned long)d + offsetof(struct btrfs_dev_item, uuid);

}

}





static inline char *btrfs_device_fsid(struct btrfs_dev_item *d)

static inline unsigned long btrfs_device_fsid(struct btrfs_dev_item *d)

{

{

	return (char *)d + offsetof(struct btrfs_dev_item, fsid);

	return (unsigned long)d + offsetof(struct btrfs_dev_item, fsid);

}

}





BTRFS_SETGET_FUNCS(chunk_length, struct btrfs_chunk, length, 64);

BTRFS_SETGET_FUNCS(chunk_length, struct btrfs_chunk, length, 64);

fs/btrfs/volumes.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -1426,7 +1426,7 @@ static int btrfs_add_device(struct btrfs_trans_handle *trans, 




	ptr = btrfs_device_uuid(dev_item);

	ptr = btrfs_device_uuid(dev_item);

	write_extent_buffer(leaf, device->uuid, ptr, BTRFS_UUID_SIZE);

	write_extent_buffer(leaf, device->uuid, ptr, BTRFS_UUID_SIZE);

	ptr = (unsigned long)btrfs_device_fsid(dev_item);

	ptr = btrfs_device_fsid(dev_item);

	write_extent_buffer(leaf, root->fs_info->fsid, ptr, BTRFS_UUID_SIZE);

	write_extent_buffer(leaf, root->fs_info->fsid, ptr, BTRFS_UUID_SIZE);

	btrfs_mark_buffer_dirty(leaf);

	btrfs_mark_buffer_dirty(leaf);
@@ -1926,8 +1926,7 @@ static int btrfs_finish_sprout(struct btrfs_trans_handle *trans, 
		devid = btrfs_device_id(leaf, dev_item);

		devid = btrfs_device_id(leaf, dev_item);

		read_extent_buffer(leaf, dev_uuid, btrfs_device_uuid(dev_item),

		read_extent_buffer(leaf, dev_uuid, btrfs_device_uuid(dev_item),

				   BTRFS_UUID_SIZE);

				   BTRFS_UUID_SIZE);

		read_extent_buffer(leaf, fs_uuid,

		read_extent_buffer(leaf, fs_uuid, btrfs_device_fsid(dev_item),

				   (unsigned long)btrfs_device_fsid(dev_item),

				   BTRFS_UUID_SIZE);

				   BTRFS_UUID_SIZE);

		device = btrfs_find_device(root->fs_info, devid, dev_uuid,

		device = btrfs_find_device(root->fs_info, devid, dev_uuid,

					   fs_uuid);

					   fs_uuid);
@@ -5824,8 +5823,7 @@ static int read_one_dev(struct btrfs_root *root, 
	devid = btrfs_device_id(leaf, dev_item);

	devid = btrfs_device_id(leaf, dev_item);

	read_extent_buffer(leaf, dev_uuid, btrfs_device_uuid(dev_item),

	read_extent_buffer(leaf, dev_uuid, btrfs_device_uuid(dev_item),

			   BTRFS_UUID_SIZE);

			   BTRFS_UUID_SIZE);

	read_extent_buffer(leaf, fs_uuid,

	read_extent_buffer(leaf, fs_uuid, btrfs_device_fsid(dev_item),

			   (unsigned long)btrfs_device_fsid(dev_item),

			   BTRFS_UUID_SIZE);

			   BTRFS_UUID_SIZE);





	if (memcmp(fs_uuid, root->fs_info->fsid, BTRFS_UUID_SIZE)) {

	if (memcmp(fs_uuid, root->fs_info->fsid, BTRFS_UUID_SIZE)) {