Merge tag 'nfsd-4.6-1' of git://linux-nfs.org/~bfields/linux

[cascardo/linux.git] / fs / nfs / blocklayout / blocklayout.c

diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c
index b27c409..02e4d87 100644 (file)
--- a/fs/nfs/blocklayout/blocklayout.c
+++ b/fs/nfs/blocklayout/blocklayout.c
@@ -756,7 +756,7 @@ bl_set_layoutdriver(struct nfs_server *server, const struct nfs_fh *fh)
 
 static bool
 is_aligned_req(struct nfs_pageio_descriptor *pgio,
-               struct nfs_page *req, unsigned int alignment)
+               struct nfs_page *req, unsigned int alignment, bool is_write)
 {
        /*
         * Always accept buffered writes, higher layers take care of the
@@ -771,7 +771,8 @@ is_aligned_req(struct nfs_pageio_descriptor *pgio,
        if (IS_ALIGNED(req->wb_bytes, alignment))
                return true;
 
-       if (req_offset(req) + req->wb_bytes == i_size_read(pgio->pg_inode)) {
+       if (is_write &&
+           (req_offset(req) + req->wb_bytes == i_size_read(pgio->pg_inode))) {
                /*
                 * If the write goes up to the inode size, just write
                 * the full page.  Data past the inode size is
@@ -788,7 +789,7 @@ is_aligned_req(struct nfs_pageio_descriptor *pgio,
 static void
 bl_pg_init_read(struct nfs_pageio_descriptor *pgio, struct nfs_page *req)
 {
-       if (!is_aligned_req(pgio, req, SECTOR_SIZE)) {
+       if (!is_aligned_req(pgio, req, SECTOR_SIZE, false)) {
                nfs_pageio_reset_read_mds(pgio);
                return;
        }
@@ -804,7 +805,7 @@ static size_t
 bl_pg_test_read(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev,
                struct nfs_page *req)
 {
-       if (!is_aligned_req(pgio, req, SECTOR_SIZE))
+       if (!is_aligned_req(pgio, req, SECTOR_SIZE, false))
                return 0;
        return pnfs_generic_pg_test(pgio, prev, req);
 }
@@ -837,7 +838,7 @@ bl_pg_init_write(struct nfs_pageio_descriptor *pgio, struct nfs_page *req)
 {
        u64 wb_size;
 
-       if (!is_aligned_req(pgio, req, PAGE_SIZE)) {
+       if (!is_aligned_req(pgio, req, PAGE_SIZE, true)) {
                nfs_pageio_reset_write_mds(pgio);
                return;
        }
@@ -859,7 +860,7 @@ static size_t
 bl_pg_test_write(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev,
                 struct nfs_page *req)
 {
-       if (!is_aligned_req(pgio, req, PAGE_SIZE))
+       if (!is_aligned_req(pgio, req, PAGE_SIZE, true))
                return 0;
        return pnfs_generic_pg_test(pgio, prev, req);
 }