From 2c1dd39b0c2902129afafd67ed455d817a1716c3 Mon Sep 17 00:00:00 2001
From: Peng Tao <bergwolf@gmail.com>
Date: Fri, 15 Jul 2011 03:33:42 -0400
Subject: [PATCH] --- yaml --- r: 260854 b: refs/heads/master c:
 3b6091846d5b6113d695c79caec7cc96b62d469b h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/nfs/read.c  | 3 ++-
 trunk/fs/nfs/write.c | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ba5446eb72d6..97810c87a66a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e4efd568574221840ee8dd86f176dc977c1330c
+refs/heads/master: 3b6091846d5b6113d695c79caec7cc96b62d469b
diff --git a/trunk/fs/nfs/read.c b/trunk/fs/nfs/read.c
index 248a55425853..581534a4aed7 100644
--- a/trunk/fs/nfs/read.c
+++ b/trunk/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/trunk/fs/nfs/write.c b/trunk/fs/nfs/write.c
index 0aeb09b38e4b..d9dd744588d4 100644
--- a/trunk/fs/nfs/write.c
+++ b/trunk/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));