Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 287892
b: refs/heads/master
c: 013bd4c
h: refs/heads/master
v: v3
  • Loading branch information
Tsutomu Itoh authored and David Sterba committed Feb 16, 2012
1 parent c519998 commit 4bcd857
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 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: 12fc9d0923ca70ae8960bccebac09d5c12f8c4d4
refs/heads/master: 013bd4c336ad0d30e9e41f9cff0dbc1858934e75
16 changes: 10 additions & 6 deletions trunk/fs/btrfs/extent_io.c
Original file line number Diff line number Diff line change
Expand Up @@ -2154,9 +2154,10 @@ static int bio_readpage_error(struct bio *failed_bio, struct page *page,
"this_mirror=%d, num_copies=%d, in_validation=%d\n", read_mode,
failrec->this_mirror, num_copies, failrec->in_validation);

tree->ops->submit_bio_hook(inode, read_mode, bio, failrec->this_mirror,
failrec->bio_flags, 0);
return 0;
ret = tree->ops->submit_bio_hook(inode, read_mode, bio,
failrec->this_mirror,
failrec->bio_flags, 0);
return ret;
}

/* lots and lots of room for performance fixes in the end_bio funcs */
Expand Down Expand Up @@ -2790,9 +2791,12 @@ static int __extent_writepage(struct page *page, struct writeback_control *wbc,
delalloc_start = delalloc_end + 1;
continue;
}
tree->ops->fill_delalloc(inode, page, delalloc_start,
delalloc_end, &page_started,
&nr_written);
ret = tree->ops->fill_delalloc(inode, page,
delalloc_start,
delalloc_end,
&page_started,
&nr_written);
BUG_ON(ret);
/*
* delalloc_end is already one less than the total
* length, so we don't subtract one from
Expand Down

0 comments on commit 4bcd857

Please sign in to comment.