aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/read.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2008-03-19 17:59:44 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2008-03-19 17:59:44 -0400
commitc7c350e92aab1bba68f26a6027b734adcf9824ba (patch)
treeaa99bd94c3049dd871d9c030d70a5f3d87591a95 /fs/nfs/read.c
parent2f42b5d043ee271d1e5d30ecd77186b6c4d4e534 (diff)
parentf8512ad0da16cbe156f3a7627971cdf0b39c4138 (diff)
Merge branch 'hotfixes' into devel
Diffstat (limited to 'fs/nfs/read.c')
-rw-r--r--fs/nfs/read.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index be9e8270f4d7..ab2f7d233e01 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -531,7 +531,10 @@ readpage_async_filler(void *data, struct page *page)
531 531
532 if (len < PAGE_CACHE_SIZE) 532 if (len < PAGE_CACHE_SIZE)
533 zero_user_segment(page, len, PAGE_CACHE_SIZE); 533 zero_user_segment(page, len, PAGE_CACHE_SIZE);
534 nfs_pageio_add_request(desc->pgio, new); 534 if (!nfs_pageio_add_request(desc->pgio, new)) {
535 error = desc->pgio->pg_error;
536 goto out_unlock;
537 }
535 return 0; 538 return 0;
536out_error: 539out_error:
537 error = PTR_ERR(new); 540 error = PTR_ERR(new);