aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/ceph/osd_client.c14
1 files changed, 8 insertions, 6 deletions
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,
733 733
734 object_size = le32_to_cpu(layout->fl_object_size); 734 object_size = le32_to_cpu(layout->fl_object_size);
735 object_base = off - objoff; 735 object_base = off - objoff;
736 if (truncate_size <= object_base) { 736 if (!(truncate_seq == 1 && truncate_size == -1ULL)) {
737 truncate_size = 0; 737 if (truncate_size <= object_base) {
738 } else { 738 truncate_size = 0;
739 truncate_size -= object_base; 739 } else {
740 if (truncate_size > object_size) 740 truncate_size -= object_base;
741 truncate_size = object_size; 741 if (truncate_size > object_size)
742 truncate_size = object_size;
743 }
742 } 744 }
743 745
744 osd_req_op_extent_init(req, 0, opcode, objoff, objlen, 746 osd_req_op_extent_init(req, 0, opcode, objoff, objlen,