Index: linux-2.6.17-rc6-cl/fs/nfs/write.c
===================================================================
--- linux-2.6.17-rc6-cl.orig/fs/nfs/write.c	2006-06-12 13:37:47.321243148 -0700
+++ linux-2.6.17-rc6-cl/fs/nfs/write.c	2006-06-12 17:11:01.027070526 -0700
@@ -1419,7 +1419,6 @@ static void nfs_commit_done(struct rpc_t
 		nfs_mark_request_dirty(req);
 	next:
 		nfs_clear_page_writeback(req);
-		dec_zone_page_state(req->wb_page, NR_UNSTABLE);
 	}
 }
 
Index: linux-2.6.17-rc6-cl/fs/nfs/pagelist.c
===================================================================
--- linux-2.6.17-rc6-cl.orig/fs/nfs/pagelist.c	2006-06-12 13:37:47.123013234 -0700
+++ linux-2.6.17-rc6-cl/fs/nfs/pagelist.c	2006-06-12 17:14:17.822489804 -0700
@@ -176,6 +176,9 @@ nfs_release_request(struct nfs_page *req
 	BUG_ON (!list_empty(&req->wb_list));
 	BUG_ON (NFS_WBACK_BUSY(req));
 #endif
+	if (req->wb_page && PageWriteback(req->wb_page))
+		/* Unstable page */
+		dec_zone_page_state(req->wb_page, NR_UNSTABLE);
 
 	/* Release struct file or cached credential */
 	nfs_clear_request(req);