diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-19 17:59:44 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-03-19 17:59:44 -0400 |
| commit | c7c350e92aab1bba68f26a6027b734adcf9824ba (patch) | |
| tree | aa99bd94c3049dd871d9c030d70a5f3d87591a95 /fs/nfs/read.c | |
| parent | 2f42b5d043ee271d1e5d30ecd77186b6c4d4e534 (diff) | |
| parent | f8512ad0da16cbe156f3a7627971cdf0b39c4138 (diff) | |
| download | kernel-common-c7c350e92aab1bba68f26a6027b734adcf9824ba.tar.gz kernel-common-c7c350e92aab1bba68f26a6027b734adcf9824ba.tar.bz2 kernel-common-c7c350e92aab1bba68f26a6027b734adcf9824ba.zip | |
Merge branch 'hotfixes' into devel
Diffstat (limited to 'fs/nfs/read.c')
| -rw-r--r-- | fs/nfs/read.c | 5 |
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) if (len < PAGE_CACHE_SIZE) zero_user_segment(page, len, PAGE_CACHE_SIZE); - nfs_pageio_add_request(desc->pgio, new); + if (!nfs_pageio_add_request(desc->pgio, new)) { + error = desc->pgio->pg_error; + goto out_unlock; + } return 0; out_error: error = PTR_ERR(new); |