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

NFSv4.1: pull error handling out of nfs_commit_list

Browse Source 
Create a separate support function for later use by data server
commit code.

Signed-off-by: Fred Isaman <iisaman@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Fred Isaman
2011-03-23 13:27:47 +00:00
committed by Trond Myklebust
parent 5f452431e2
commit 64bfeb49bd
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
fs/nfs/write.c
View File

@@ -1357,6 +1357,21 @@ static void nfs_init_commit(struct nfs_write_data *data,
nfs_fattr_init(&data->fattr); nfs_fattr_init(&data->fattr);
} }
static void nfs_retry_commit(struct list_head *page_list)
{
struct nfs_page *req;
while (!list_empty(page_list)) {
req = nfs_list_entry(page_list->next);
nfs_list_remove_request(req);
nfs_mark_request_commit(req);
dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);
dec_bdi_stat(req->wb_page->mapping->backing_dev_info,
BDI_RECLAIMABLE);
nfs_clear_page_tag_locked(req);
}
}
/* /*
* Commit dirty pages * Commit dirty pages
*/ */
@@ -1364,7 +1379,6 @@ static int
nfs_commit_list(struct inode *inode, struct list_head *head, int how) nfs_commit_list(struct inode *inode, struct list_head *head, int how)
{ {
struct nfs_write_data *data; struct nfs_write_data *data;
struct nfs_page *req;
data = nfs_commitdata_alloc(); data = nfs_commitdata_alloc();
@@ -1375,15 +1389,7 @@ nfs_commit_list(struct inode *inode, struct list_head *head, int how)
nfs_init_commit(data, head); nfs_init_commit(data, head);
return nfs_initiate_commit(data, NFS_CLIENT(inode), data->mds_ops, how); return nfs_initiate_commit(data, NFS_CLIENT(inode), data->mds_ops, how);
out_bad: out_bad:
while (!list_empty(head)) { nfs_retry_commit(head);
req = nfs_list_entry(head->next);
nfs_list_remove_request(req);
nfs_mark_request_commit(req);
dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);
dec_bdi_stat(req->wb_page->mapping->backing_dev_info,
BDI_RECLAIMABLE);
nfs_clear_page_tag_locked(req);
}
nfs_commit_clear_lock(NFS_I(inode)); nfs_commit_clear_lock(NFS_I(inode));
return -ENOMEM; return -ENOMEM;
} }