NFS: fix return value of nfs_pagein_one/nfs_flush_one

Signed-off-by: Peng Tao <peng_tao@emc.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

2 files changed, 3 insertions, 2 deletions

diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index 248a55425853..581534a4aed7 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -351,12 +351,13 @@ static int nfs_pagein_one(struct nfs_pageio_descriptor *desc)
         struct nfs_read_data    *data;
         struct list_head *head = &desc->pg_list;
         struct pnfs_layout_segment *lseg = desc->pg_lseg;
-        int ret = -ENOMEM;
+        int ret = 0;
 
         data = nfs_readdata_alloc(nfs_page_array_len(desc->pg_base,
                                                      desc->pg_count));
         if (!data) {
                 nfs_async_read_error(head);
+                ret = -ENOMEM;
                 goto out;
         }
 
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 0aeb09b38e4b..d9dd744588d4 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -1006,7 +1006,7 @@ static int nfs_flush_one(struct nfs_pageio_descriptor *desc)
         struct nfs_write_data   *data;
         struct list_head *head = &desc->pg_list;
         struct pnfs_layout_segment *lseg = desc->pg_lseg;
-        int ret;
+        int ret = 0;
 
         data = nfs_writedata_alloc(nfs_page_array_len(desc->pg_base,
                                                       desc->pg_count));