From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Chris Mason <chris.mason@fusionio.com>
Cc: linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org,
Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [PATCH 07/12] Btrfs: Make btrfs_dev_extent_chunk_tree_uuid() return unsigned long
Date: Tue, 20 Aug 2013 13:20:13 +0200 [thread overview]
Message-ID: <1376997618-13573-8-git-send-email-geert@linux-m68k.org> (raw)
In-Reply-To: <1376997618-13573-1-git-send-email-geert@linux-m68k.org>
Internally, btrfs_dev_extent_chunk_tree_uuid() calculates an unsigned long,
but casts it to a pointer, while all callers cast it to unsigned long
again.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
fs/btrfs/ctree.h | 4 ++--
fs/btrfs/volumes.c | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 641a29a..21f9632 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -2277,10 +2277,10 @@ BTRFS_SETGET_FUNCS(dev_extent_chunk_offset, struct btrfs_dev_extent,
chunk_offset, 64);
BTRFS_SETGET_FUNCS(dev_extent_length, struct btrfs_dev_extent, length, 64);
-static inline u8 *btrfs_dev_extent_chunk_tree_uuid(struct btrfs_dev_extent *dev)
+static inline unsigned long btrfs_dev_extent_chunk_tree_uuid(struct btrfs_dev_extent *dev)
{
unsigned long ptr = offsetof(struct btrfs_dev_extent, chunk_tree_uuid);
- return (u8 *)((unsigned long)dev + ptr);
+ return (unsigned long)dev + ptr;
}
BTRFS_SETGET_FUNCS(extent_refs, struct btrfs_extent_item, refs, 64);
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index b05dbb6..15a0a4e 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1277,8 +1277,7 @@ static int btrfs_alloc_dev_extent(struct btrfs_trans_handle *trans,
btrfs_set_dev_extent_chunk_offset(leaf, extent, chunk_offset);
write_extent_buffer(leaf, root->fs_info->chunk_tree_uuid,
- (unsigned long)btrfs_dev_extent_chunk_tree_uuid(extent),
- BTRFS_UUID_SIZE);
+ btrfs_dev_extent_chunk_tree_uuid(extent), BTRFS_UUID_SIZE);
btrfs_set_dev_extent_length(leaf, extent, num_bytes);
btrfs_mark_buffer_dirty(leaf);
--
1.7.9.5
next prev parent reply other threads:[~2013-08-20 11:22 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-20 11:20 [PATCH 00/12] Btrfs: cast cleanups Geert Uytterhoeven
2013-08-20 11:20 ` [PATCH 01/12] Btrfs: Remove superfluous casts from u64 to unsigned long long Geert Uytterhoeven
2013-08-20 14:16 ` Eric Sandeen
2013-08-20 14:17 ` Eric Sandeen
2013-08-20 11:20 ` [PATCH 02/12] Btrfs: Make BTRFS_DEV_REPLACE_DEVID an unsigned long long constant Geert Uytterhoeven
2013-08-20 11:20 ` [PATCH 03/12] Btrfs: Format PAGE_SIZE as unsigned long Geert Uytterhoeven
2013-08-20 11:20 ` [PATCH 04/12] Btrfs: Format mirror_num as int Geert Uytterhoeven
2013-08-20 11:20 ` [PATCH 05/12] Btrfs: Make btrfs_device_uuid() return unsigned long Geert Uytterhoeven
2013-08-20 11:20 ` [PATCH 06/12] Btrfs: Make btrfs_device_fsid() " Geert Uytterhoeven
2013-08-20 11:20 ` Geert Uytterhoeven [this message]
2013-08-20 11:20 ` [PATCH 08/12] Btrfs: Make btrfs_header_fsid() " Geert Uytterhoeven
2013-08-20 11:20 ` [PATCH 09/12] Btrfs: Make btrfs_header_chunk_tree_uuid() " Geert Uytterhoeven
2013-08-20 11:20 ` [PATCH 10/12] Btrfs: PAGE_CACHE_SIZE is already " Geert Uytterhoeven
2013-08-20 11:20 ` [PATCH 11/12] Btrfs: Do not truncate sector_t on 32-bit with CONFIG_LBDAF=y Geert Uytterhoeven
2013-08-20 11:20 ` [PATCH 12/12] Btrfs: Use %z to format size_t Geert Uytterhoeven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1376997618-13573-8-git-send-email-geert@linux-m68k.org \
--to=geert@linux-m68k.org \
--cc=chris.mason@fusionio.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).