lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'hotfixes' into devel

Browse Source
This commit is contained in:
Trond Myklebust
2008-03-19 17:59:44 -04:00
parent 2f42b5d043 f8512ad0da
commit c7c350e92a
455 changed files with 6451 additions and 6075 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fs/nfs/read.c
View File

@@ -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);