mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 03:01:39 -04:00
Merge commit '9f12600fe4' into for-linus
Backmerge of dcache.c changes from mainline. It's that, or complete rebase... Conflicts: fs/splice.c Signed-off-by: Al Viro <[email protected]>
This commit is contained in:
commit
9c1d5284c7
599 changed files with 7374 additions and 3790 deletions
|
|
@ -257,9 +257,11 @@ static int filemap_check_errors(struct address_space *mapping)
|
|||
{
|
||||
int ret = 0;
|
||||
/* Check for outstanding write errors */
|
||||
if (test_and_clear_bit(AS_ENOSPC, &mapping->flags))
|
||||
if (test_bit(AS_ENOSPC, &mapping->flags) &&
|
||||
test_and_clear_bit(AS_ENOSPC, &mapping->flags))
|
||||
ret = -ENOSPC;
|
||||
if (test_and_clear_bit(AS_EIO, &mapping->flags))
|
||||
if (test_bit(AS_EIO, &mapping->flags) &&
|
||||
test_and_clear_bit(AS_EIO, &mapping->flags))
|
||||
ret = -EIO;
|
||||
return ret;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue