From cd9e3e671c71c802f47b422c7fc76d9868e68a71 Mon Sep 17 00:00:00 2001
From: Fred Isaman <iisaman@netapp.com>
Date: Fri, 20 Apr 2012 14:47:35 -0400
Subject: [PATCH] --- yaml --- r: 299645 b: refs/heads/master c:
 8ccd271f7a3a846ce6f85ead0760d9d12994a611 h: refs/heads/master i:   299643:
 c27042b5840a9368a4d08b11036d0ea92fbe2a20 v: v3

---
 [refs]               | 2 +-
 trunk/fs/nfs/write.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3c79da83080e..ce4401fd3b2c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73fb7bc7c57d971b11f2e00536ac2d3e316e0609
+refs/heads/master: 8ccd271f7a3a846ce6f85ead0760d9d12994a611
diff --git a/trunk/fs/nfs/write.c b/trunk/fs/nfs/write.c
index 9b8d4d42a8af..c07462320f6b 100644
--- a/trunk/fs/nfs/write.c
+++ b/trunk/fs/nfs/write.c
@@ -1019,7 +1019,7 @@ static int nfs_flush_multi(struct nfs_pageio_descriptor *desc, struct list_head
 	while (!list_empty(res)) {
 		data = list_entry(res->next, struct nfs_write_data, list);
 		list_del(&data->list);
-		nfs_writedata_free(data);
+		nfs_writedata_release(data);
 	}
 	nfs_redirty_request(req);
 	return -ENOMEM;