projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'akpm' (patches from Andrew)
[cascardo/linux.git]
/
drivers
/
staging
/
lustre
/
lustre
/
llite
/
vvp_page.c
diff --git
a/drivers/staging/lustre/lustre/llite/vvp_page.c
b/drivers/staging/lustre/lustre/llite/vvp_page.c
index
5d79efc
..
046e84d
100644
(file)
--- a/
drivers/staging/lustre/lustre/llite/vvp_page.c
+++ b/
drivers/staging/lustre/lustre/llite/vvp_page.c
@@
-241,10
+241,7
@@
static void vvp_vmpage_error(struct inode *inode, struct page *vmpage, int ioret
obj->vob_discard_page_warned = 0;
} else {
SetPageError(vmpage);
obj->vob_discard_page_warned = 0;
} else {
SetPageError(vmpage);
- if (ioret == -ENOSPC)
- set_bit(AS_ENOSPC, &inode->i_mapping->flags);
- else
- set_bit(AS_EIO, &inode->i_mapping->flags);
+ mapping_set_error(inode->i_mapping, ioret);
if ((ioret == -ESHUTDOWN || ioret == -EINTR) &&
obj->vob_discard_page_warned == 0) {
if ((ioret == -ESHUTDOWN || ioret == -EINTR) &&
obj->vob_discard_page_warned == 0) {