diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-20 11:59:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-20 11:59:34 -0700 |
| commit | 49ccf74aaf6b53751dc0ae06ded9bb39343da822 (patch) | |
| tree | 1c1c362bc870ea74c3aa6db9bd85b14f1bd68c9d /fs/nfs/read.c | |
| parent | 45ddfbf9594a344dfecbb320d74636023d813539 (diff) | |
| parent | f8512ad0da16cbe156f3a7627971cdf0b39c4138 (diff) | |
Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
nfs: don't ignore return value from nfs_pageio_add_request
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 3d7d9631e12..5a70be589bb 100644 --- a/fs/nfs/read.c +++ b/fs/nfs/read.c @@ -533,7 +533,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); |