From: Sebastien Ponce <sebastien.ponce@cern.ch>
Date: Wed, 26 Mar 2014 11:35:32 +0000 (+0100)
Subject: Added const qualifiers for the layout argument of file_to_extents and object_truncate... 
X-Git-Tag: v0.83~124^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=62064f38c4ca25113360807152f0b65e6bbc8c47;p=ceph.git

Added const qualifiers for the layout argument of file_to_extents and object_truncate_size

Signed-off-by: Sebastien Ponce <sebastien.ponce@cern.ch>
---

diff --git a/src/osdc/Striper.cc b/src/osdc/Striper.cc
index bde32846f111..d99518a49cd1 100644
--- a/src/osdc/Striper.cc
+++ b/src/osdc/Striper.cc
@@ -27,7 +27,7 @@
 
 
 void Striper::file_to_extents(CephContext *cct, const char *object_format,
-			    ceph_file_layout *layout,
+			    const ceph_file_layout *layout,
 			    uint64_t offset, uint64_t len, uint64_t trunc_size,
 			    vector<ObjectExtent>& extents,
 			    uint64_t buffer_offset)
@@ -39,7 +39,7 @@ void Striper::file_to_extents(CephContext *cct, const char *object_format,
 }
 
 void Striper::file_to_extents(CephContext *cct, const char *object_format,
-			      ceph_file_layout *layout,
+			      const ceph_file_layout *layout,
 			      uint64_t offset, uint64_t len, uint64_t trunc_size,
 			      map<object_t,vector<ObjectExtent> >& object_extents,
 			      uint64_t buffer_offset)
@@ -177,7 +177,7 @@ void Striper::extent_to_file(CephContext *cct, ceph_file_layout *layout,
   }
 }
 
-uint64_t Striper::object_truncate_size(CephContext *cct, ceph_file_layout *layout,
+uint64_t Striper::object_truncate_size(CephContext *cct, const ceph_file_layout *layout,
 				       uint64_t objectno, uint64_t trunc_size)
 {
   uint64_t obj_trunc_size;
diff --git a/src/osdc/Striper.h b/src/osdc/Striper.h
index bd61fc8f91c1..cc5c0ed7a720 100644
--- a/src/osdc/Striper.h
+++ b/src/osdc/Striper.h
@@ -29,19 +29,19 @@ class CephContext;
      * ranges in objects on (primary) osds)
      */
     static void file_to_extents(CephContext *cct, const char *object_format,
-				ceph_file_layout *layout,
+				const ceph_file_layout *layout,
 				uint64_t offset, uint64_t len, uint64_t trunc_size,
 				map<object_t, vector<ObjectExtent> >& extents,
 				uint64_t buffer_offset=0);
 
     static void file_to_extents(CephContext *cct, const char *object_format,
-				ceph_file_layout *layout,
+				const ceph_file_layout *layout,
 				uint64_t offset, uint64_t len, uint64_t trunc_size,
 				vector<ObjectExtent>& extents,
 				uint64_t buffer_offset=0);
 
     static void file_to_extents(CephContext *cct, inodeno_t ino,
-				ceph_file_layout *layout,
+				const ceph_file_layout *layout,
 				uint64_t offset, uint64_t len, uint64_t trunc_size,
 				vector<ObjectExtent>& extents) {
       // generate prefix/format
@@ -61,7 +61,7 @@ class CephContext;
 			       uint64_t objectno, uint64_t off, uint64_t len,
 			       vector<pair<uint64_t, uint64_t> >& extents);
 
-    static uint64_t object_truncate_size(CephContext *cct, ceph_file_layout *layout,
+    static uint64_t object_truncate_size(CephContext *cct, const ceph_file_layout *layout,
 					 uint64_t objectno, uint64_t trunc_size);
 
     /*