libceph: fix truncate size calculation

commit ccca4e37b1a912da3db68aee826557ea66145273 upstream.

check the "not truncated yet" case

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 8 insertions, 6 deletions

diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 10e947cbc478..3e46e538cbf5 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,