diff options
author | Chris Mason <chris.mason@oracle.com> | 2007-11-06 15:09:29 -0500 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2008-09-25 11:03:57 -0400 |
commit | e644d021e328d3902559e5db687383f2da85993c (patch) | |
tree | 12fa85275a3333c709ddc03c2f4fd426b97a9dcf /fs/btrfs/ctree.h | |
parent | f84a8b362d9785ca1fa0598d8a90f35184bd8750 (diff) |
Fix recursive KM_USER1 usage in btrfs_realloc_node
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/ctree.h')
-rw-r--r-- | fs/btrfs/ctree.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index f7907b02fa77..030d21d7f98c 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h | |||
@@ -557,14 +557,9 @@ static inline unsigned long btrfs_node_key_ptr_offset(int nr) | |||
557 | sizeof(struct btrfs_key_ptr) * nr; | 557 | sizeof(struct btrfs_key_ptr) * nr; |
558 | } | 558 | } |
559 | 559 | ||
560 | static inline void btrfs_node_key(struct extent_buffer *eb, | 560 | void btrfs_node_key(struct extent_buffer *eb, |
561 | struct btrfs_disk_key *disk_key, int nr) | 561 | struct btrfs_disk_key *disk_key, int nr); |
562 | { | 562 | |
563 | unsigned long ptr; | ||
564 | ptr = btrfs_node_key_ptr_offset(nr); | ||
565 | read_eb_member(eb, (struct btrfs_key_ptr *)ptr, | ||
566 | struct btrfs_key_ptr, key, disk_key); | ||
567 | } | ||
568 | static inline void btrfs_set_node_key(struct extent_buffer *eb, | 563 | static inline void btrfs_set_node_key(struct extent_buffer *eb, |
569 | struct btrfs_disk_key *disk_key, int nr) | 564 | struct btrfs_disk_key *disk_key, int nr) |
570 | { | 565 | { |