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>

diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index 248a554258532411282d8084760420f470e31b68..581534a4aed7aaf1ed729121b56bb95cbf7e61de 100644 (file)
--- 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 0aeb09b38e4bba73ab876bb46013fa5eb89db48b..d9dd744588d44a4a3cbfdc0e2e2178d2a7148fdf 100644 (file)
--- 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));