summaryrefslogtreecommitdiff
path: root/fs/xfs/xfs_btree.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-09-05 12:52:33 +0900
committerPaul Mundt <lethal@linux-sh.org>2011-09-05 12:52:33 +0900
commitf1e0477a7b7a541f51eea279910eed4ddd010033 (patch)
tree552841f13496306f0140d5faca82ae9987a81b5e /fs/xfs/xfs_btree.h
parentb58c580d996655658975aa8042b43b7d579f3986 (diff)
parent9e79e3e9dd9672b37ac9412e9a926714306551fe (diff)
downloadlinux-f1e0477a7b7a541f51eea279910eed4ddd010033.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
Diffstat (limited to 'fs/xfs/xfs_btree.h')
-rw-r--r--fs/xfs/xfs_btree.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/xfs/xfs_btree.h b/fs/xfs/xfs_btree.h
index 8d05a6a46ce3..5b240de104c0 100644
--- a/fs/xfs/xfs_btree.h
+++ b/fs/xfs/xfs_btree.h
@@ -262,7 +262,7 @@ typedef struct xfs_btree_cur
/*
* Convert from buffer to btree block header.
*/
-#define XFS_BUF_TO_BLOCK(bp) ((struct xfs_btree_block *)XFS_BUF_PTR(bp))
+#define XFS_BUF_TO_BLOCK(bp) ((struct xfs_btree_block *)((bp)->b_addr))
/*