mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
Factor outstanding I/O error handling
Cleanup: setting an outstanding error on a mapping was open coded too many times. Factor it out in mapping_set_error(). Signed-off-by: Guillaume Chazarain <[email protected]> Cc: Steven Whitehouse <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
c83e448420
commit
3e9f45bd18
5 changed files with 17 additions and 30 deletions
16
fs/mpage.c
16
fs/mpage.c
|
|
@ -663,12 +663,7 @@ confused:
|
|||
/*
|
||||
* The caller has a ref on the inode, so *mapping is stable
|
||||
*/
|
||||
if (*ret) {
|
||||
if (*ret == -ENOSPC)
|
||||
set_bit(AS_ENOSPC, &mapping->flags);
|
||||
else
|
||||
set_bit(AS_EIO, &mapping->flags);
|
||||
}
|
||||
mapping_set_error(mapping, *ret);
|
||||
out:
|
||||
return bio;
|
||||
}
|
||||
|
|
@ -776,14 +771,7 @@ retry:
|
|||
|
||||
if (writepage) {
|
||||
ret = (*writepage)(page, wbc);
|
||||
if (ret) {
|
||||
if (ret == -ENOSPC)
|
||||
set_bit(AS_ENOSPC,
|
||||
&mapping->flags);
|
||||
else
|
||||
set_bit(AS_EIO,
|
||||
&mapping->flags);
|
||||
}
|
||||
mapping_set_error(mapping, ret);
|
||||
} else {
|
||||
bio = __mpage_writepage(bio, page, get_block,
|
||||
&last_block_in_bio, &ret, wbc,
|
||||
|
|
|
|||
Loading…
Reference in a new issue