diff options
| author | Chris Mason | 2007-11-06 21:09:29 +0100 |
|---|---|---|
| committer | Chris Mason | 2008-09-25 17:03:57 +0200 |
| commit | e644d021e328d3902559e5db687383f2da85993c (patch) | |
| tree | 12fa85275a3333c709ddc03c2f4fd426b97a9dcf /fs/btrfs/ctree.h | |
| parent | Btrfs: Optimize allocations as we need to mix data and metadata into one group (diff) | |
| download | kernel-qcow2-linux-e644d021e328d3902559e5db687383f2da85993c.tar.gz kernel-qcow2-linux-e644d021e328d3902559e5db687383f2da85993c.tar.xz kernel-qcow2-linux-e644d021e328d3902559e5db687383f2da85993c.zip | |
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) sizeof(struct btrfs_key_ptr) * nr; } -static inline void btrfs_node_key(struct extent_buffer *eb, - struct btrfs_disk_key *disk_key, int nr) -{ - unsigned long ptr; - ptr = btrfs_node_key_ptr_offset(nr); - read_eb_member(eb, (struct btrfs_key_ptr *)ptr, - struct btrfs_key_ptr, key, disk_key); -} +void btrfs_node_key(struct extent_buffer *eb, + struct btrfs_disk_key *disk_key, int nr); + static inline void btrfs_set_node_key(struct extent_buffer *eb, struct btrfs_disk_key *disk_key, int nr) { |