---

yaml --- r: 359556 b: refs/heads/master c: a41bad1 h: refs/heads/master v: v3
git-mirror · Jan 17, 2013 · 35b20b5 · 35b20b5
1 parent 626adb4
commit 35b20b5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e8575faa8fa680d59404a4d58d12190667be815
+refs/heads/master: a41bad1a9b9f9982eb9b451165724c5f81096683
diff --git a/trunk/net/ceph/osd_client.c b/trunk/net/ceph/osd_client.c
@@ -76,8 +76,16 @@ int ceph_calc_raw_layout(struct ceph_osd_client *osdc,
 		     orig_len - *plen, off, *plen);
 
 	if (op_has_extent(op->op)) {
+		u32 osize = le32_to_cpu(layout->fl_object_size);
 		op->extent.offset = objoff;
 		op->extent.length = objlen;
+		if (op->extent.truncate_size <= off - objoff) {
+			op->extent.truncate_size = 0;
+		} else {
+			op->extent.truncate_size -= off - objoff;
+			if (op->extent.truncate_size > osize)
+				op->extent.truncate_size = osize;
+		}
 	}
 	req->r_num_pages = calc_pages_for(off, *plen);
 	req->r_page_alignment = off & ~PAGE_MASK;