summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorYan, Zheng <zheng.z.yan@intel.com>2012-11-30 13:49:51 +0800
committerAlex Elder <elder@inktank.com>2013-01-17 12:42:37 -0600
commita41bad1a9b9f9982eb9b451165724c5f81096683 (patch)
tree1bc98665b919bb81d68152422484a5af220af4d2 /net
parent6e8575faa8fa680d59404a4d58d12190667be815 (diff)
downloadop-kernel-dev-a41bad1a9b9f9982eb9b451165724c5f81096683.zip
op-kernel-dev-a41bad1a9b9f9982eb9b451165724c5f81096683.tar.gz
ceph: re-calculate truncate_size for strip object
Otherwise osd may truncate the object to larger size. Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com> Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'net')
-rw-r--r--net/ceph/osd_client.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index eb9a444..267f183 100644
--- a/net/ceph/osd_client.c
+++ b/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;
OpenPOWER on IntegriCloud