redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

Btrfs: Make btrfs_device_fsid() return unsigned long

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

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
This commit is contained in:
Geert Uytterhoeven 2013-08-20 13:20:12 +02:00 committed by Chris Mason
parent 410ba3a291
commit 1473b24ee0
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/btrfs/ctree.h
View file

@ -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);

8
fs/btrfs/volumes.c
View file

@ -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 @@ next_slot:
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)) {