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

Btrfs: Make btrfs_device_uuid() return unsigned long 

All callers of btrfs_device_uuid() 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>
hifive-unleashed-5.1
Geert Uytterhoeven 2013-08-20 13:20:11 +02:00 committed by Chris Mason
parent 118a0a2514
commit 410ba3a291
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/btrfs/ctree.h
View File

@ -2164,9 +2164,9 @@ BTRFS_SETGET_STACK_FUNCS(stack_device_bandwidth, struct btrfs_dev_item,
BTRFS_SETGET_STACK_FUNCS(stack_device_generation, struct btrfs_dev_item, BTRFS_SETGET_STACK_FUNCS(stack_device_generation, struct btrfs_dev_item,
generation, 64); generation, 64);
static inline char *btrfs_device_uuid(struct btrfs_dev_item *d) static inline unsigned long btrfs_device_uuid(struct btrfs_dev_item *d)
{ {
return (char *)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 char *btrfs_device_fsid(struct btrfs_dev_item *d)

10
fs/btrfs/volumes.c
View File

@ -1424,7 +1424,7 @@ static int btrfs_add_device(struct btrfs_trans_handle *trans,
btrfs_set_device_bandwidth(leaf, dev_item, 0); btrfs_set_device_bandwidth(leaf, dev_item, 0);
btrfs_set_device_start_offset(leaf, dev_item, 0); btrfs_set_device_start_offset(leaf, dev_item, 0);
ptr = (unsigned long)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 = (unsigned long)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);
@ -1924,8 +1924,7 @@ next_slot:
dev_item = btrfs_item_ptr(leaf, path->slots[0], dev_item = btrfs_item_ptr(leaf, path->slots[0],
struct btrfs_dev_item); struct btrfs_dev_item);
devid = btrfs_device_id(leaf, dev_item); devid = btrfs_device_id(leaf, dev_item);
read_extent_buffer(leaf, dev_uuid, read_extent_buffer(leaf, dev_uuid, btrfs_device_uuid(dev_item),
(unsigned long)btrfs_device_uuid(dev_item),
BTRFS_UUID_SIZE); BTRFS_UUID_SIZE);
read_extent_buffer(leaf, fs_uuid, read_extent_buffer(leaf, fs_uuid,
(unsigned long)btrfs_device_fsid(dev_item), (unsigned long)btrfs_device_fsid(dev_item),
@ -5760,7 +5759,7 @@ static void fill_device_from_item(struct extent_buffer *leaf,
WARN_ON(device->devid == BTRFS_DEV_REPLACE_DEVID); WARN_ON(device->devid == BTRFS_DEV_REPLACE_DEVID);
device->is_tgtdev_for_dev_replace = 0; device->is_tgtdev_for_dev_replace = 0;
ptr = (unsigned long)btrfs_device_uuid(dev_item); ptr = btrfs_device_uuid(dev_item);
read_extent_buffer(leaf, device->uuid, ptr, BTRFS_UUID_SIZE); read_extent_buffer(leaf, device->uuid, ptr, BTRFS_UUID_SIZE);
} }
@ -5823,8 +5822,7 @@ static int read_one_dev(struct btrfs_root *root,
u8 dev_uuid[BTRFS_UUID_SIZE]; u8 dev_uuid[BTRFS_UUID_SIZE];
devid = btrfs_device_id(leaf, dev_item); devid = btrfs_device_id(leaf, dev_item);
read_extent_buffer(leaf, dev_uuid, read_extent_buffer(leaf, dev_uuid, btrfs_device_uuid(dev_item),
(unsigned long)btrfs_device_uuid(dev_item),
BTRFS_UUID_SIZE); BTRFS_UUID_SIZE);
read_extent_buffer(leaf, fs_uuid, read_extent_buffer(leaf, fs_uuid,
(unsigned long)btrfs_device_fsid(dev_item), (unsigned long)btrfs_device_fsid(dev_item),