Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 128692
b: refs/heads/master
c: 2b114d1
h: refs/heads/master
v: v3
  • Loading branch information
Peter authored and Chris Mason committed Sep 25, 2008
1 parent 05daa3a commit 100d487
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e58ca0203d32869a01540a293df40ddc480dc378
refs/heads/master: 2b114d1d33551ab1dcaa1d0b3a956df3776fb767
18 changes: 9 additions & 9 deletions trunk/fs/btrfs/extent_io.c
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ struct extent_state *alloc_extent_state(gfp_t mask)
unsigned long flags;

state = kmem_cache_alloc(extent_state_cache, mask);
if (!state || IS_ERR(state))
if (!state)
return state;
state->state = 0;
state->private = 0;
Expand Down Expand Up @@ -957,7 +957,7 @@ int find_first_extent_bit(struct extent_io_tree *tree, u64 start,
* our range starts.
*/
node = tree_search(tree, start);
if (!node || IS_ERR(node)) {
if (!node) {
goto out;
}

Expand Down Expand Up @@ -990,7 +990,7 @@ struct extent_state *find_first_extent_bit_state(struct extent_io_tree *tree,
* our range starts.
*/
node = tree_search(tree, start);
if (!node || IS_ERR(node)) {
if (!node) {
goto out;
}

Expand Down Expand Up @@ -1024,7 +1024,7 @@ u64 find_lock_delalloc_range(struct extent_io_tree *tree,
*/
search_again:
node = tree_search(tree, cur_start);
if (!node || IS_ERR(node)) {
if (!node) {
*end = (u64)-1;
goto out;
}
Expand Down Expand Up @@ -1112,7 +1112,7 @@ u64 count_range_bits(struct extent_io_tree *tree,
* our range starts.
*/
node = tree_search(tree, cur_start);
if (!node || IS_ERR(node)) {
if (!node) {
goto out;
}

Expand Down Expand Up @@ -1213,7 +1213,7 @@ int set_state_private(struct extent_io_tree *tree, u64 start, u64 private)
* our range starts.
*/
node = tree_search(tree, start);
if (!node || IS_ERR(node)) {
if (!node) {
ret = -ENOENT;
goto out;
}
Expand All @@ -1240,7 +1240,7 @@ int get_state_private(struct extent_io_tree *tree, u64 start, u64 *private)
* our range starts.
*/
node = tree_search(tree, start);
if (!node || IS_ERR(node)) {
if (!node) {
ret = -ENOENT;
goto out;
}
Expand Down Expand Up @@ -2642,7 +2642,7 @@ struct extent_buffer *alloc_extent_buffer(struct extent_io_tree *tree,
int uptodate = 1;

eb = __alloc_extent_buffer(tree, start, len, mask);
if (!eb || IS_ERR(eb))
if (!eb)
return NULL;

if (eb->flags & EXTENT_BUFFER_FILLED)
Expand Down Expand Up @@ -2717,7 +2717,7 @@ struct extent_buffer *find_extent_buffer(struct extent_io_tree *tree,
int uptodate = 1;

eb = __alloc_extent_buffer(tree, start, len, mask);
if (!eb || IS_ERR(eb))
if (!eb)
return NULL;

if (eb->flags & EXTENT_BUFFER_FILLED)
Expand Down

0 comments on commit 100d487

Please sign in to comment.