Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 12:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Btrfs: cleanup error handling in extent_write_cached_pages

Browse Source 
Now that we bail out immediately if ->writepage() returns an error,
we don't need an extra error to retain the error code.

Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Liu Bo 2016-03-07 16:56:22 -08:00 committed by David Sterba
parent a91326679f
commit 894b36e35a
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/btrfs/extent_io.c
View File

@ -3916,7 +3916,6 @@ static int extent_write_cache_pages(struct extent_io_tree *tree,
struct inode *inode = mapping->host;
int ret = 0;
int done = 0;
int err = 0;
int nr_to_write_done = 0;
struct pagevec pvec;
int nr_pages;
@ -4009,8 +4008,6 @@ retry:
unlock_page(page);
ret = 0;
}
if (!err && ret < 0)
err = ret;
if (ret < 0) {
/*
* done_index is set past this page,
@ -4036,7 +4033,7 @@ retry:
pagevec_release(&pvec);
cond_resched();
}
if (!scanned && !done && !err) {
if (!scanned && !done) {
/*
* We hit the last page and there is more work to be done: wrap
* back to the start of the file
@ -4050,7 +4047,7 @@ retry:
mapping->writeback_index = done_index;
btrfs_add_delayed_iput(inode);
return err;
return ret;
}
static void flush_epd_write_bio(struct extent_page_data *epd)