diff options
| author | Tejun Heo <tj@kernel.org> | 2011-02-21 03:43:56 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-02-21 03:43:56 -0500 |
| commit | 43d133c18b44e7d82d82ef0dcc2bddd55d5dfe81 (patch) | |
| tree | 8de75c837b55874cc8a81a29bdedbc62668d4481 /fs/btrfs/ordered-data.c | |
| parent | 4149efb22da66e326fc48baf80d628834509f7f0 (diff) | |
| parent | 6f576d57f1fa0d6026b495d8746d56d949989161 (diff) | |
Merge branch 'master' into for-2.6.39
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 | ||