From: John Spray <john.spray@redhat.com>
Date: Thu, 1 Dec 2016 15:25:52 +0000 (+0000)
Subject: osdc/Filer: const fix for passed layouts
X-Git-Tag: v12.0.1~140^2~27
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=50f478345972c301c52b215a4476427c5a92ffeb;p=ceph.git

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 592593e43521..17152f78b44c 100644
--- 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 db752cbc03ea..8f2fd3e686d1 100644
--- 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,