diff options
| author | Pekka Enberg <penberg@kernel.org> | 2011-03-11 11:10:45 -0500 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2011-03-11 11:10:45 -0500 |
| commit | c9149556756d56c68451a4a8735c37e7062fd3d7 (patch) | |
| tree | a2dae56b22adaa9a23c8f92f30c3b3ad3b610850 /fs/btrfs/ordered-data.c | |
| parent | d71f606f687ef9d0cdddfd3619ca7cb9a0b3fb63 (diff) | |
| parent | 5bfe53a77e8a3ffce4a10003c75f464a138e272d (diff) | |
Merge branch 'slab/rcu' into slab/next
Conflicts:
mm/slub.c
Diffstat (limited to 'fs/btrfs/ordered-data.c')
| -rw-r--r-- | fs/btrfs/ordered-data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c index 2b61e1ddcd99..083a55477375 100644 --- a/fs/btrfs/ordered-data.c +++ b/fs/btrfs/ordered-data.c | |||
| @@ -141,7 +141,7 @@ static inline struct rb_node *tree_search(struct btrfs_ordered_inode_tree *tree, | |||
| 141 | u64 file_offset) | 141 | u64 file_offset) |
| 142 | { | 142 | { |
| 143 | struct rb_root *root = &tree->tree; | 143 | struct rb_root *root = &tree->tree; |
| 144 | struct rb_node *prev; | 144 | struct rb_node *prev = NULL; |
| 145 | struct rb_node *ret; | 145 | struct rb_node *ret; |
| 146 | struct btrfs_ordered_extent *entry; | 146 | struct btrfs_ordered_extent *entry; |
| 147 | 147 | ||