From: Yan, Zheng <zheng.z.yan@intel.com>
Date: Sun, 2 Jun 2013 10:40:23 +0000 (+0800)
Subject: libceph: fix truncate size calculation
X-Git-Tag: next-20130617~100^2~9
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bdcdce7fc6b3beeee76e6333d18b25ba837cdff6;p=karo-tx-linux.git

libceph: fix truncate size calculation

check the "not truncated yet" case

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Reviewed-by: Sage Weil <sage@inktank.com>
---

diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 3480b058794b..540dd29c9210 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -733,12 +733,14 @@ struct ceph_osd_request *ceph_osdc_new_request(struct ceph_osd_client *osdc,
 
 	object_size = le32_to_cpu(layout->fl_object_size);
 	object_base = off - objoff;
-	if (truncate_size <= object_base) {
-		truncate_size = 0;
-	} else {
-		truncate_size -= object_base;
-		if (truncate_size > object_size)
-			truncate_size = object_size;
+	if (!(truncate_seq == 1 && truncate_size == -1ULL)) {
+		if (truncate_size <= object_base) {
+			truncate_size = 0;
+		} else {
+			truncate_size -= object_base;
+			if (truncate_size > object_size)
+				truncate_size = object_size;
+		}
 	}
 
 	osd_req_op_extent_init(req, 0, opcode, objoff, objlen,