mds, client: make MClientCaps::layout private

...so that it's more obvious where it's being
set,get'ed from.

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

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 645f3b97181b7bd084889d5cdec9f49338995ce9..2ad844266df1c0cdbe2e39d5a10ddaec1df8c629 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -3250,7 +3250,7 @@ void Client::send_cap(Inode *in, MetaSession *session, Cap *cap,
     m->head.xattr_version = in->xattr_version;
   }
   
-  m->layout = in->layout;
+  m->set_layout(in->layout);
   m->size = in->size;
   m->max_size = in->max_size;
   m->truncate_seq = in->truncate_seq;

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index d6c024c28fc94a7f81fdd8ee5907bef483ef0e21..6bf463fc2c903097471b559480df4d0c4d69edef 100644 (file)
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -3389,7 +3389,7 @@ void CInode::encode_cap_message(MClientCaps *m, Capability *cap)
           << " ctime " << i->ctime << dendl;
 
   i = pfile ? pi:oi;
-  m->layout = i->layout;
+  m->set_layout(i->layout);
   m->size = i->size;
   m->truncate_seq = i->truncate_seq;
   m->truncate_size = i->truncate_size;

diff --git a/src/messages/MClientCaps.h b/src/messages/MClientCaps.h
index 7153f7fbbc0f0966c76555e4aaf898e22008073d..3364ca632f5c7c9cd1c887a06c874a9c313588ea 100644 (file)
--- a/src/messages/MClientCaps.h
+++ b/src/messages/MClientCaps.h
@@ -29,7 +29,6 @@ class MClientCaps : public Message {
   uint64_t size, max_size, truncate_size, change_attr;
   uint32_t truncate_seq;
   utime_t mtime, atime, ctime, btime;
-  file_layout_t layout;
   uint32_t time_warp_seq;
 
   struct ceph_mds_cap_peer peer;
@@ -72,6 +71,10 @@ class MClientCaps : public Message {
     return layout;
   }
 
+  void set_layout(const file_layout_t &l) {
+    layout = l;
+  }
+
   int       get_migrate_seq() { return head.migrate_seq; }
   int       get_op() { return head.op; }
 
@@ -176,6 +179,8 @@ class MClientCaps : public Message {
     inline_version = 0;
   }
 private:
+  file_layout_t layout;
+
   ~MClientCaps() {}
 
 public: