]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
client: note order of member init in cons 10169/head
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 7 Jul 2016 01:50:47 +0000 (21:50 -0400)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 8 Jul 2016 01:08:36 +0000 (21:08 -0400)
(The order of the initializer list is not relevant, only the order of class members.)

This also makes explicit the passed reference to the ino member by "this->ino".

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
src/client/Inode.h

index 5398c68c41f60a91b525c47a30caec05ade90f44..31c2b746293b1a5dc44f4d5c975788dd81fbaf6b 100644 (file)
@@ -85,7 +85,7 @@ struct Inode {
   Client *client;
 
   // -- the actual inode --
-  inodeno_t ino;
+  inodeno_t ino; // ORDER DEPENDENCY: oset
   snapid_t  snapid;
   ino_t faked_ino;
 
@@ -179,7 +179,7 @@ struct Inode {
   map<int,int> open_by_mode;
   map<int,int> cap_refs;
 
-  ObjectCacher::ObjectSet oset;
+  ObjectCacher::ObjectSet oset; // ORDER DEPENDENCY: ino
 
   uint64_t     reported_size, wanted_max_size, requested_max_size;
 
@@ -235,7 +235,7 @@ struct Inode {
       snap_caps(0), snap_cap_refs(0),
       cap_item(this), flushing_cap_item(this),
       snaprealm(0), snaprealm_item(this),
-      oset((void *)this, newlayout->pool_id, ino),
+      oset((void *)this, newlayout->pool_id, this->ino),
       reported_size(0), wanted_max_size(0), requested_max_size(0),
       _ref(0), ll_ref(0), dn_set(),
       fcntl_locks(NULL), flock_locks(NULL),