From d1828d2a63b1924dd0886bb145a0c15be9bf4158 Mon Sep 17 00:00:00 2001
From: Alex Elder <elder@inktank.com>
Date: Fri, 21 Sep 2012 17:59:58 -0500
Subject: [PATCH] --- yaml --- r: 323141 b: refs/heads/master c:
 5ce765a540f34d1e2005e1210f49f67fdf11e997 h: refs/heads/master i:   323139:
 c1ef84de0a60c85a48dbbb7a5ffb98a69e2625a4 v: v3

---
 [refs]                     | 2 +-
 trunk/net/ceph/messenger.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index dd45bc16d77c..dc61c948b0a5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 340c7a2b2c9a2da640af28a8c196356484ac8b50
+refs/heads/master: 5ce765a540f34d1e2005e1210f49f67fdf11e997
diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c
index 24c5eea8c45b..159aa8bef9e7 100644
--- a/trunk/net/ceph/messenger.c
+++ b/trunk/net/ceph/messenger.c
@@ -1073,16 +1073,13 @@ static int write_partial_msg_pages(struct ceph_connection *con)
 			BUG_ON(kaddr == NULL);
 			base = kaddr + con->out_msg_pos.page_pos + bio_offset;
 			crc = crc32c(crc, base, len);
+			kunmap(page);
 			msg->footer.data_crc = cpu_to_le32(crc);
 			con->out_msg_pos.did_page_crc = true;
 		}
 		ret = ceph_tcp_sendpage(con->sock, page,
 				      con->out_msg_pos.page_pos + bio_offset,
 				      len, 1);
-
-		if (do_datacrc)
-			kunmap(page);
-
 		if (ret <= 0)
 			goto out;