NFS: Prevent a deadlock in the new writeback code
We have to unlock the nfs_page before we call nfs_end_page_writeback
to avoid races with functions that expect the page to be unlocked
when PG_locked and PG_writeback are not set.
The problem is that nfs_unlock_request also releases the nfs_page,
causing a deadlock if the release of the nfs_open_context
triggers an iput() while the PG_writeback flag is still set...
The solution is to separate the unlocking and release of the nfs_page,
so that we can do the former before nfs_end_page_writeback and the
latter after.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: Fred Isaman <iisaman@netapp.com>
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 6f263da..fd36b31 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -628,8 +628,9 @@
remove_req:
nfs_inode_remove_request(req);
next:
- nfs_unlock_request(req);
+ nfs_unlock_request_dont_release(req);
nfs_end_page_writeback(page);
+ nfs_release_request(req);
}
out:
hdr->release(hdr);
@@ -1042,8 +1043,9 @@
struct page *page = req->wb_page;
nfs_mark_request_dirty(req);
- nfs_unlock_request(req);
+ nfs_unlock_request_dont_release(req);
nfs_end_page_writeback(page);
+ nfs_release_request(req);
}
static void nfs_async_write_error(struct list_head *head)