Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

Pull pnfs/ore fixes from Boaz Harrosh:
 "These are catastrophic fixes to the pnfs objects-layout that were just
  discovered.  They are also destined for @stable.

  I have found these and worked on them at around RC1 time but
  unfortunately went to the hospital for kidney stones and had a very
  slow recovery.  I refrained from sending them as is, before proper
  testing, and surly I have found a bug just yesterday.

  So now they are all well tested, and have my sign-off.  Other then
  fixing the problem at hand, and assuming there are no bugs at the new
  code, there is low risk to any surrounding code.  And in anyway they
  affect only these paths that are now broken.  That is RAID5 in pnfs
  objects-layout code.  It does also affect exofs (which was not broken)
  but I have tested exofs and it is lower priority then objects-layout
  because no one is using exofs, but objects-layout has lots of users."

* 'for-linus' of git://git.open-osd.org/linux-open-osd:
  pnfs-obj: Fix __r4w_get_page when offset is beyond i_size
  pnfs-obj: don't leak objio_state if ore_write/read fails
  ore: Unlock r4w pages in exact reverse order of locking
  ore: Remove support of partial IO request (NFS crash)
  ore: Fix NFS crash by supporting any unaligned RAID IO

1 files changed, 20 insertions, 5 deletions

diff --git a/fs/nfs/objlayout/objio_osd.c b/fs/nfs/objlayout/objio_osd.c
index b47277baebab..f50d3e8d6f22 100644
--- a/fs/nfs/objlayout/objio_osd.c
+++ b/fs/nfs/objlayout/objio_osd.c
@@ -454,7 +454,10 @@ int objio_read_pagelist(struct nfs_read_data *rdata)
         objios->ios->done = _read_done;
         dprintk("%s: offset=0x%llx length=0x%x\n", __func__,
                 rdata->args.offset, rdata->args.count);
-        return ore_read(objios->ios);
+        ret = ore_read(objios->ios);
+        if (unlikely(ret))
+                objio_free_result(&objios->oir);
+        return ret;
 }
 
 /*
@@ -486,8 +489,16 @@ static struct page *__r4w_get_page(void *priv, u64 offset, bool *uptodate)
         struct nfs_write_data *wdata = objios->oir.rpcdata;
         struct address_space *mapping = wdata->header->inode->i_mapping;
         pgoff_t index = offset / PAGE_SIZE;
-        struct page *page = find_get_page(mapping, index);
+        struct page *page;
+        loff_t i_size = i_size_read(wdata->header->inode);
+
+        if (offset >= i_size) {
+                *uptodate = true;
+                dprintk("%s: g_zero_page index=0x%lx\n", __func__, index);
+                return ZERO_PAGE(0);
+        }
 
+        page = find_get_page(mapping, index);
         if (!page) {
                 page = find_or_create_page(mapping, index, GFP_NOFS);
                 if (unlikely(!page)) {
@@ -507,8 +518,10 @@ static struct page *__r4w_get_page(void *priv, u64 offset, bool *uptodate)
 
 static void __r4w_put_page(void *priv, struct page *page)
 {
-        dprintk("%s: index=0x%lx\n", __func__, page->index);
-        page_cache_release(page);
+        dprintk("%s: index=0x%lx\n", __func__,
+                (page == ZERO_PAGE(0)) ? -1UL : page->index);
+        if (ZERO_PAGE(0) != page)
+                page_cache_release(page);
         return;
 }
 
@@ -539,8 +552,10 @@ int objio_write_pagelist(struct nfs_write_data *wdata, int how)
         dprintk("%s: offset=0x%llx length=0x%x\n", __func__,
                 wdata->args.offset, wdata->args.count);
         ret = ore_write(objios->ios);
-        if (unlikely(ret))
+        if (unlikely(ret)) {
+                objio_free_result(&objios->oir);
                 return ret;
+        }
 
         if (objios->sync)
                 _write_done(objios->ios, objios);