AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

NFS: fix return value of nfs_pagein_one/nfs_flush_one

Browse Source 
Signed-off-by: Peng Tao <peng_tao@emc.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Peng Tao 2011-07-15 03:33:42 -04:00 committed by Trond Myklebust
parent 6e4efd5685
commit 3b6091846d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/nfs/read.c
View File

@ -351,12 +351,13 @@ static int nfs_pagein_one(struct nfs_pageio_descriptor *desc)
struct nfs_read_data *data; struct nfs_read_data *data;
struct list_head *head = &desc->pg_list; struct list_head *head = &desc->pg_list;
struct pnfs_layout_segment *lseg = desc->pg_lseg; 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, data = nfs_readdata_alloc(nfs_page_array_len(desc->pg_base,
desc->pg_count)); desc->pg_count));
if (!data) { if (!data) {
nfs_async_read_error(head); nfs_async_read_error(head);
ret = -ENOMEM;
goto out; goto out;
} }

2
fs/nfs/write.c
View File

@ -1006,7 +1006,7 @@ static int nfs_flush_one(struct nfs_pageio_descriptor *desc)
struct nfs_write_data *data; struct nfs_write_data *data;
struct list_head *head = &desc->pg_list; struct list_head *head = &desc->pg_list;
struct pnfs_layout_segment *lseg = desc->pg_lseg; struct pnfs_layout_segment *lseg = desc->pg_lseg;
int ret; int ret = 0;
data = nfs_writedata_alloc(nfs_page_array_len(desc->pg_base, data = nfs_writedata_alloc(nfs_page_array_len(desc->pg_base,
desc->pg_count)); desc->pg_count));