2 files changed, 5 insertions, 7 deletions

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index b4e70537cada..b71bc3a99342 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -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);
 }
 
-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);
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 9ea500465256..8b8c4397165c 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1426,7 +1426,7 @@ static int btrfs_add_device(struct btrfs_trans_handle *trans,
 
         ptr = btrfs_device_uuid(dev_item);
         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);
         btrfs_mark_buffer_dirty(leaf);
 
@@ -1926,8 +1926,7 @@ next_slot:
                 devid = btrfs_device_id(leaf, dev_item);
                 read_extent_buffer(leaf, dev_uuid, btrfs_device_uuid(dev_item),
                                    BTRFS_UUID_SIZE);
-                read_extent_buffer(leaf, fs_uuid,
-                                   (unsigned long)btrfs_device_fsid(dev_item),
+                read_extent_buffer(leaf, fs_uuid, btrfs_device_fsid(dev_item),
                                    BTRFS_UUID_SIZE);
                 device = btrfs_find_device(root->fs_info, devid, dev_uuid,
                                            fs_uuid);
@@ -5824,8 +5823,7 @@ static int read_one_dev(struct btrfs_root *root,
         devid = btrfs_device_id(leaf, dev_item);
         read_extent_buffer(leaf, dev_uuid, btrfs_device_uuid(dev_item),
                            BTRFS_UUID_SIZE);
-        read_extent_buffer(leaf, fs_uuid,
-                           (unsigned long)btrfs_device_fsid(dev_item),
+        read_extent_buffer(leaf, fs_uuid, btrfs_device_fsid(dev_item),
                            BTRFS_UUID_SIZE);
 
         if (memcmp(fs_uuid, root->fs_info->fsid, BTRFS_UUID_SIZE)) {