summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroya Nozaki <nozaki.hiroya@jp.fujitsu.com>2016-11-10 12:31:00 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-11-14 16:02:55 +0100
commitca42800ced404044603e89d485a34d0239047435 (patch)
treec4357af943beea55c4b6fbd7dc987a099aa9d3dd
parent6bf18cd3b3e0ce5995b55dcb5b7005fe18523d8b (diff)
staging: lustre: llite: ll_write_begin/end not passing on errors
Because of a implementation of generic_perform_write(), write(2) may return 0 with no errno even if EDQUOT or ENOSPC actually happened in it. This patch fixes the issue with setting a proper errno to ci_result. Signed-off-by: Hiroya Nozaki <nozaki.hiroya@jp.fujitsu.com> Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-6732 Reviewed-on: http://review.whamcloud.com/15302 Reviewed-by: Bobi Jam <bobijam@hotmail.com> Reviewed-by: Andreas Dilger <andreas.dilger@intel.com> Reviewed-by: Oleg Drokin <oleg.drokin@intel.com> Signed-off-by: James Simmons <jsimmons@infradead.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/lustre/lustre/llite/rw26.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/staging/lustre/lustre/llite/rw26.c b/drivers/staging/lustre/lustre/llite/rw26.c
index ca45b44dee33..c1b74096d46e 100644
--- a/drivers/staging/lustre/lustre/llite/rw26.c
+++ b/drivers/staging/lustre/lustre/llite/rw26.c
@@ -478,6 +478,7 @@ static int ll_write_begin(struct file *file, struct address_space *mapping,
lcc = ll_cl_find(file);
if (!lcc) {
+ io = NULL;
result = -EIO;
goto out;
}
@@ -558,6 +559,8 @@ out:
lu_ref_del(&page->cp_reference, "cl_io", io);
cl_page_put(env, page);
}
+ if (io)
+ io->ci_result = result;
} else {
*pagep = vmpage;
*fsdata = lcc;
@@ -627,6 +630,8 @@ static int ll_write_end(struct file *file, struct address_space *mapping,
file->f_flags & O_SYNC || IS_SYNC(file_inode(file)))
result = vvp_io_write_commit(env, io);
+ if (result < 0)
+ io->ci_result = result;
return result >= 0 ? copied : result;
}