osdc/Filer: const fix for passed layouts

...so that const references can be passed into
purge calls.

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/src/osdc/Filer.cc b/src/osdc/Filer.cc
index 592593e43521da875ddafc146b8a978381dd2aa7..17152f78b44c56103db5373a5e7f1247fa06e827 100644 (file)
--- a/src/osdc/Filer.cc
+++ b/src/osdc/Filer.cc
@@ -302,7 +302,7 @@ struct PurgeRange {
   int flags;
   Context *oncommit;
   int uncommitted;
-  PurgeRange(inodeno_t i, file_layout_t& l, const SnapContext& sc,
+  PurgeRange(inodeno_t i, const file_layout_t& l, const SnapContext& sc,
             uint64_t fo, uint64_t no, ceph::real_time t, int fl,
             Context *fin)
     : ino(i), layout(l), snapc(sc), first(fo), num(no), mtime(t), flags(fl),
@@ -310,7 +310,7 @@ struct PurgeRange {
 };
 
 int Filer::purge_range(inodeno_t ino,
-                      file_layout_t *layout,
+                      const file_layout_t *layout,
                       const SnapContext& snapc,
                       uint64_t first_obj, uint64_t num_obj,
                       ceph::real_time mtime,

diff --git a/src/osdc/Filer.h b/src/osdc/Filer.h
index db752cbc03ea2c853c48cb65dc9464aa055dce52..8f2fd3e686d1e2bdec293a930279bd6e790f479b 100644 (file)
--- a/src/osdc/Filer.h
+++ b/src/osdc/Filer.h
@@ -220,7 +220,7 @@ class Filer {
   }
 
   void zero(inodeno_t ino,
-          file_layout_t *layout,
+          const file_layout_t *layout,
           const SnapContext& snapc,
           uint64_t offset,
           uint64_t len,
@@ -273,7 +273,7 @@ class Filer {
   }
   // purge range of ino.### objects
   int purge_range(inodeno_t ino,
-                 file_layout_t *layout,
+                 const file_layout_t *layout,
                  const SnapContext& snapc,
                  uint64_t first_obj, uint64_t num_obj,
                  ceph::real_time mtime,