aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYang Sheng2017-10-07 17:36:54 -0500
committerGreg Kroah-Hartman2017-11-08 03:08:36 -0600
commita513df5968ad2bb58c783979a541c9159b00e44f (patch)
tree0d79dd62b186881674662e7870816bb9236b1095
parentc3f0c2c140005fc041eb6eb5364af46d5ca47e27 (diff)
downloadkernel-integration-tree-a513df5968ad2bb58c783979a541c9159b00e44f.tar.gz
kernel-integration-tree-a513df5968ad2bb58c783979a541c9159b00e44f.tar.xz
kernel-integration-tree-a513df5968ad2bb58c783979a541c9159b00e44f.zip
staging: lustre: llite: don't invoke direct_IO for the EOF case
[ Upstream commit 77759771fb95420d23876cb104ab65c022613325 ] The function generic_file_read_iter() does not check EOF before invoke direct_IO callback. So we have to check it ourselves. Signed-off-by: Yang Sheng <yang.sheng@intel.com> Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-8969 Reviewed-on: https://review.whamcloud.com/24552 Reviewed-by: Bob Glossman <bob.glossman@intel.com> Reviewed-by: Bobi Jam <bobijam@hotmail.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> Signed-off-by: Sasha Levin <alexander.levin@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/lustre/lustre/llite/rw26.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/staging/lustre/lustre/llite/rw26.c b/drivers/staging/lustre/lustre/llite/rw26.c
index 26f3a37873a7..0cb70c3a1a0b 100644
--- a/drivers/staging/lustre/lustre/llite/rw26.c
+++ b/drivers/staging/lustre/lustre/llite/rw26.c
@@ -354,6 +354,10 @@ static ssize_t ll_direct_IO_26(struct kiocb *iocb, struct iov_iter *iter)
354 if (!lli->lli_has_smd) 354 if (!lli->lli_has_smd)
355 return -EBADF; 355 return -EBADF;
356 356
357 /* Check EOF by ourselves */
358 if (iov_iter_rw(iter) == READ && file_offset >= i_size_read(inode))
359 return 0;
360
357 /* FIXME: io smaller than PAGE_SIZE is broken on ia64 ??? */ 361 /* FIXME: io smaller than PAGE_SIZE is broken on ia64 ??? */
358 if ((file_offset & ~PAGE_MASK) || (count & ~PAGE_MASK)) 362 if ((file_offset & ~PAGE_MASK) || (count & ~PAGE_MASK))
359 return -EINVAL; 363 return -EINVAL;