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

NFS: Don't clear PG_writeback until after we've processed unstable writes

Browse Source 
Ensure that we don't release the PG_writeback lock until after the page has
either been redirtied, or queued on the nfs_inode 'commit' list.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Trond Myklebust
2007-04-20 16:12:40 -04:00
committed by Linus Torvalds
parent 8e821cad12
commit 6d677e3504
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fs/nfs/write.c
View File

@@ -920,8 +920,8 @@ out_bad:
list_del(&data->pages); list_del(&data->pages);
nfs_writedata_release(data); nfs_writedata_release(data);
} }
nfs_end_page_writeback(req->wb_page);
nfs_redirty_request(req); nfs_redirty_request(req);
nfs_end_page_writeback(req->wb_page);
nfs_clear_page_writeback(req); nfs_clear_page_writeback(req);
return -ENOMEM; return -ENOMEM;
} }
@@ -966,8 +966,8 @@ static int nfs_flush_one(struct inode *inode, struct list_head *head, int how)
while (!list_empty(head)) { while (!list_empty(head)) {
struct nfs_page *req = nfs_list_entry(head->next); struct nfs_page *req = nfs_list_entry(head->next);
nfs_list_remove_request(req); nfs_list_remove_request(req);
nfs_end_page_writeback(req->wb_page);
nfs_redirty_request(req); nfs_redirty_request(req);
nfs_end_page_writeback(req->wb_page);
nfs_clear_page_writeback(req); nfs_clear_page_writeback(req);
} }
return -ENOMEM; return -ENOMEM;
@@ -1002,8 +1002,8 @@ out_err:
while (!list_empty(head)) { while (!list_empty(head)) {
req = nfs_list_entry(head->next); req = nfs_list_entry(head->next);
nfs_list_remove_request(req); nfs_list_remove_request(req);
nfs_end_page_writeback(req->wb_page);
nfs_redirty_request(req); nfs_redirty_request(req);
nfs_end_page_writeback(req->wb_page);
nfs_clear_page_writeback(req); nfs_clear_page_writeback(req);
} }
return error; return error;