---

yaml --- r: 323141 b: refs/heads/master c: 5ce765a h: refs/heads/master i: 323139: c1ef84d v: v3
git-mirror · Sep 22, 2012 · d1828d2 · d1828d2
1 parent e2dd780
commit d1828d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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;