mds: be consistent about list<>::item naming (item_foo)

diff --git a/src/mds/CDentry.cc b/src/mds/CDentry.cc
index 16ba3ca72b86c5ae8dc6b02ff6fd207e0646a42f..f24bfac9fd55b1f72ed065347463eb6cc94b0f3a 100644 (file)
--- a/src/mds/CDentry.cc
+++ b/src/mds/CDentry.cc
@@ -166,7 +166,7 @@ void CDentry::_mark_dirty(LogSegment *ls)
     assert(ls);
   }
   if (ls) 
-    ls->dirty_dentries.push_back(&dlist_dirty);
+    ls->dirty_dentries.push_back(&item_dirty);
 }
 
 void CDentry::mark_dirty(version_t pv, LogSegment *ls) 
@@ -194,7 +194,7 @@ void CDentry::mark_clean()
   dir->dec_num_dirty();
   put(PIN_DIRTY);
   
-  dlist_dirty.remove_myself();
+  item_dirty.remove_myself();
 
   if (state_test(STATE_NEW)) 
     state_clear(STATE_NEW);
@@ -565,8 +565,8 @@ int CDentry::remove_client_lease(ClientLease *l, int mask, Locker *locker)
   if (rc == 0) {
     dout(20) << "removing lease for client" << l->client << dendl;
     client_lease_map.erase(l->client);
-    l->lease_item.remove_myself();
-    l->session_lease_item.remove_myself();
+    l->item_lease.remove_myself();
+    l->item_session_lease.remove_myself();
     delete l;
     if (client_lease_map.empty())
       put(PIN_CLIENTLEASE);

diff --git a/src/mds/CDentry.h b/src/mds/CDentry.h
index 11f87ac664b00af628dcb6db00f4ca72dd1e9021..3ef4b575ff2cefb2220751b54fe992a3bdee9561 100644 (file)
--- a/src/mds/CDentry.h
+++ b/src/mds/CDentry.h
@@ -133,7 +133,7 @@ protected:
   version_t projected_version;  // what it will be when i unlock/commit.
 
 public:
-  elist<CDentry*>::item dlist_dirty;
+  elist<CDentry*>::item item_dirty;
 
 protected:
   int auth_pins, nested_auth_pins;
@@ -163,7 +163,7 @@ public:
     first(f), last(l),
     dir(0),
     version(0), projected_version(0),
-    dlist_dirty(this),
+    item_dirty(this),
     auth_pins(0), nested_auth_pins(0), nested_anchors(0),
     lock(this, &lock_type) {
     g_num_dn++;
@@ -175,7 +175,7 @@ public:
     first(f), last(l),
     dir(0),
     version(0), projected_version(0),
-    dlist_dirty(this),
+    item_dirty(this),
     auth_pins(0), nested_auth_pins(0), nested_anchors(0),
     lock(this, &lock_type) {
     g_num_dn++;

diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
index cc3d07461ea22f13905b437333948fefb5160831..08dacfedc0e57c9f2f2264b1a645d55e39fd22b3 100644 (file)
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc
@@ -148,7 +148,7 @@ ostream& CDir::print_db_line_prefix(ostream& out)
 // CDir
 
 CDir::CDir(CInode *in, frag_t fg, MDCache *mdcache, bool auth) :
-  dlist_dirty(this), dlist_new(this)
+  item_dirty(this), item_new(this)
 {
   g_num_dir++;
   g_num_dira++;
@@ -946,17 +946,17 @@ void CDir::_mark_dirty(LogSegment *ls)
     dout(10) << "mark_dirty (already dirty) " << *this << " version " << get_version() << dendl;
   }
   if (ls) {
-    ls->dirty_dirfrags.push_back(&dlist_dirty);
+    ls->dirty_dirfrags.push_back(&item_dirty);
 
     // if i've never committed, i need to be before _any_ mention of me is trimmed from the journal.
-    if (committed_version == 0 && !dlist_new.is_on_list())
-      ls->new_dirfrags.push_back(&dlist_dirty);
+    if (committed_version == 0 && !item_new.is_on_list())
+      ls->new_dirfrags.push_back(&item_dirty);
   }
 }
 
 void CDir::mark_new(LogSegment *ls)
 {
-  ls->new_dirfrags.push_back(&dlist_new);
+  ls->new_dirfrags.push_back(&item_new);
 }
 
 void CDir::mark_clean()
@@ -966,8 +966,8 @@ void CDir::mark_clean()
     state_clear(STATE_DIRTY);
     put(PIN_DIRTY);
 
-    dlist_dirty.remove_myself();
-    dlist_new.remove_myself();
+    item_dirty.remove_myself();
+    item_new.remove_myself();
   }
 }
 
@@ -1639,7 +1639,7 @@ void CDir::_committed(version_t v, version_t lrv)
   if (get_frag() == frag_t() &&     // only counts on first frag
       inode->state_test(CInode::STATE_DIRTYPARENT) &&
       lrv == inode->inode.last_renamed_version) {
-    inode->dlist_renamed_file.remove_myself();
+    inode->item_renamed_file.remove_myself();
     inode->state_clear(CInode::STATE_DIRTYPARENT);
     dout(10) << "_committed  stored parent pointer, removed from renamed_files list " << *inode << dendl;
   }

diff --git a/src/mds/CDir.h b/src/mds/CDir.h
index 169f93819293342fd57961f7cbfe3a57f90a69a6..26ee85c72ee829dffa3b4b23a0c6ae78ae07613e 100644 (file)
--- a/src/mds/CDir.h
+++ b/src/mds/CDir.h
@@ -168,7 +168,7 @@ protected:
   list<fnode_t*> projected_fnode;
 
 public:
-  elist<CDir*>::item dlist_dirty, dlist_new;
+  elist<CDir*>::item item_dirty, item_new;
 
 
 public:

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index dd8d9ee10758cfa0b3fef8e1a5741317c054dbdc..35336f934f1aacf8dfb4b3489715c5095b794f7b 100644 (file)
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -540,7 +540,7 @@ Capability *CInode::add_client_cap(client_t client, Session *session, SnapRealm
       containing_realm = conrealm;
     else
       containing_realm = find_snaprealm();
-    containing_realm->inodes_with_caps.push_back(&dlist_caps);
+    containing_realm->inodes_with_caps.push_back(&item_caps);
   }
 
   mdcache->num_caps++;
@@ -564,7 +564,7 @@ void CInode::remove_client_cap(client_t client)
   assert(client_caps.count(client) == 1);
   Capability *cap = client_caps[client];
   
-  cap->session_caps_item.remove_myself();
+  cap->item_session_caps.remove_myself();
   containing_realm->remove_cap(client, cap);
   
   if (client == loner_cap)
@@ -574,9 +574,9 @@ void CInode::remove_client_cap(client_t client)
   client_caps.erase(client);
   if (client_caps.empty()) {
     put(PIN_CAPS);
-    dlist_caps.remove_myself();
+    item_caps.remove_myself();
     containing_realm = NULL;
-    dlist_open_file.remove_myself();  // unpin logsegment
+    item_open_file.remove_myself();  // unpin logsegment
     mdcache->num_inodes_with_caps--;
   }
   mdcache->num_caps--;
@@ -608,7 +608,7 @@ void CInode::_mark_dirty(LogSegment *ls)
   
   // move myself to this segment's dirty list
   if (ls) 
-    ls->dirty_inodes.push_back(&dlist_dirty);
+    ls->dirty_inodes.push_back(&item_dirty);
 }
 
 void CInode::mark_dirty(version_t pv, LogSegment *ls) {
@@ -644,7 +644,7 @@ void CInode::mark_clean()
     put(PIN_DIRTY);
     
     // remove myself from ls dirty list
-    dlist_dirty.remove_myself();
+    item_dirty.remove_myself();
   }
 }    
 
@@ -807,7 +807,7 @@ void CInode::_stored_parent(version_t v, Context *fin)
 {
   if (v == inode.last_renamed_version) {
     dout(10) << "stored_parent committed v" << v << ", removing from list" << dendl;
-    dlist_renamed_file.remove_myself();
+    item_renamed_file.remove_myself();
     state_clear(STATE_DIRTYPARENT);
   } else {
     dout(10) << "stored_parent committed v" << v << " < " << inode.last_renamed_version
@@ -1156,15 +1156,15 @@ void CInode::clear_dirty_scattered(int type)
   dout(10) << "clear_dirty_scattered " << type << " on " << *this << dendl;
   switch (type) {
   case CEPH_LOCK_IFILE:
-    dlist_dirty_dirfrag_dir.remove_myself();
+    item_dirty_dirfrag_dir.remove_myself();
     break;
 
   case CEPH_LOCK_INEST:
-    dlist_dirty_dirfrag_nest.remove_myself();
+    item_dirty_dirfrag_nest.remove_myself();
     break;
 
   case CEPH_LOCK_IDFT:
-    dlist_dirty_dirfrag_dirfragtree.remove_myself();
+    item_dirty_dirfrag_dirfragtree.remove_myself();
     break;
 
   default:

diff --git a/src/mds/CInode.h b/src/mds/CInode.h
index 3413f802730b76f7996aecaf25f03db42dccbf1c..d9c64240839d020b68e60c6ce31278bf6c9399b5 100644 (file)
--- a/src/mds/CInode.h
+++ b/src/mds/CInode.h
@@ -272,13 +272,13 @@ protected:
 
   // LogSegment dlists i (may) belong to
 public:
-  elist<CInode*>::item dlist_dirty;
-  elist<CInode*>::item dlist_caps;
-  elist<CInode*>::item dlist_open_file;
-  elist<CInode*>::item dlist_renamed_file;
-  elist<CInode*>::item dlist_dirty_dirfrag_dir;
-  elist<CInode*>::item dlist_dirty_dirfrag_nest;
-  elist<CInode*>::item dlist_dirty_dirfrag_dirfragtree;
+  elist<CInode*>::item item_dirty;
+  elist<CInode*>::item item_caps;
+  elist<CInode*>::item item_open_file;
+  elist<CInode*>::item item_renamed_file;
+  elist<CInode*>::item item_dirty_dirfrag_dir;
+  elist<CInode*>::item item_dirty_dirfrag_nest;
+  elist<CInode*>::item item_dirty_dirfrag_dirfragtree;
 
 private:
   // auth pin
@@ -316,10 +316,10 @@ private:
     parent(0),
     inode_auth(CDIR_AUTH_DEFAULT),
     replica_caps_wanted(0),
-    dlist_dirty(this), dlist_caps(this), dlist_open_file(this), dlist_renamed_file(this), 
-    dlist_dirty_dirfrag_dir(this), 
-    dlist_dirty_dirfrag_nest(this), 
-    dlist_dirty_dirfrag_dirfragtree(this), 
+    item_dirty(this), item_caps(this), item_open_file(this), item_renamed_file(this), 
+    item_dirty_dirfrag_dir(this), 
+    item_dirty_dirfrag_nest(this), 
+    item_dirty_dirfrag_dirfragtree(this), 
     auth_pins(0), nested_auth_pins(0),
     nested_anchors(0),
     versionlock(this, &versionlock_type),
@@ -689,8 +689,8 @@ public:
       containing_realm->remove_cap(q->first, q->second);
       realm->add_cap(q->first, q->second);
     }
-    dlist_caps.remove_myself();
-    realm->inodes_with_caps.push_back(&dlist_caps);
+    item_caps.remove_myself();
+    realm->inodes_with_caps.push_back(&item_caps);
     containing_realm = realm;
   }
 

diff --git a/src/mds/Capability.h b/src/mds/Capability.h
index 6afbe9863e6f951212c80751e714e78d047c245e..b86413668d2efea6257ac6be8133f349c96bcc13 100644 (file)
--- a/src/mds/Capability.h
+++ b/src/mds/Capability.h
@@ -225,9 +225,8 @@ public:
   snapid_t client_follows;
   version_t client_xattr_version;
   
-  xlist<Capability*>::item session_caps_item;
-
-  xlist<Capability*>::item snaprealm_caps_item;
+  xlist<Capability*>::item item_session_caps;
+  xlist<Capability*>::item item_snaprealm_caps;
 
   Capability(CInode *i, __u64 id, client_t c) : 
     inode(i), client(c),
@@ -238,7 +237,7 @@ public:
     mseq(0),
     suppress(0), stale(false),
     client_follows(0), client_xattr_version(0),
-    session_caps_item(this), snaprealm_caps_item(this) {
+    item_session_caps(this), item_snaprealm_caps(this) {
     g_num_cap++;
     g_num_capa++;
   }

diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc
index 5733a5d4e71b5a3857bbc99287f4626483fdb00f..66b6ab658b0631cc1ada24e90746096aea3d7d0d 100644 (file)
--- a/src/mds/Locker.cc
+++ b/src/mds/Locker.cc
@@ -1523,7 +1523,7 @@ bool Locker::check_inode_max_size(CInode *in, bool force_wrlock,
     eo->add_ino(in->ino());
     metablob = &eo->metablob;
     le = eo;
-    mut->ls->open_files.push_back(&in->dlist_open_file);
+    mut->ls->open_files.push_back(&in->item_open_file);
   } else {
     EUpdate *eu = new EUpdate(mds->mdlog, "check_inode_max_size");
     metablob = &eu->metablob;
@@ -1601,19 +1601,19 @@ void Locker::adjust_cap_wanted(Capability *cap, int wanted, int issue_seq)
 
   CInode *cur = cap->get_inode();
   if (cap->wanted() == 0) {
-    if (cur->dlist_open_file.is_on_list() &&
+    if (cur->item_open_file.is_on_list() &&
        !cur->is_any_caps_wanted()) {
       dout(10) << " removing unwanted file from open file list " << *cur << dendl;
-      cur->dlist_open_file.remove_myself();
+      cur->item_open_file.remove_myself();
     }
   } else {
-    if (!cur->dlist_open_file.is_on_list()) {
+    if (!cur->item_open_file.is_on_list()) {
       dout(10) << " adding to open file list " << *cur << dendl;
       LogSegment *ls = mds->mdlog->get_current_segment();
       EOpen *le = new EOpen(mds->mdlog);
       mds->mdlog->start_entry(le);
       le->add_clean_inode(cur);
-      ls->open_files.push_back(&cur->dlist_open_file);
+      ls->open_files.push_back(&cur->item_open_file);
       mds->mdlog->submit_entry(le);
     }
   }

diff --git a/src/mds/LogSegment.h b/src/mds/LogSegment.h
index f1cc4aa4521f140913db12bc9fb6dc7f5a2d3c28..ed34be6c47dc9102b7b9b11e6d6976c0cd655fda 100644 (file)
--- a/src/mds/LogSegment.h
+++ b/src/mds/LogSegment.h
@@ -71,15 +71,15 @@ class LogSegment {
   // cons
   LogSegment(loff_t off) :
     offset(off), end(off), num_events(0), trimmable_at(0),
-    dirty_dirfrags(member_offset(CDir, dlist_dirty)),
-    new_dirfrags(member_offset(CDir, dlist_new)),
-    dirty_inodes(member_offset(CInode, dlist_dirty)),
-    dirty_dentries(member_offset(CDentry, dlist_dirty)),
-    open_files(member_offset(CInode, dlist_open_file)),
-    renamed_files(member_offset(CInode, dlist_renamed_file)),
-    dirty_dirfrag_dir(member_offset(CInode, dlist_dirty_dirfrag_dir)),
-    dirty_dirfrag_nest(member_offset(CInode, dlist_dirty_dirfrag_nest)),
-    dirty_dirfrag_dirfragtree(member_offset(CInode, dlist_dirty_dirfrag_dirfragtree)),
+    dirty_dirfrags(member_offset(CDir, item_dirty)),
+    new_dirfrags(member_offset(CDir, item_new)),
+    dirty_inodes(member_offset(CInode, item_dirty)),
+    dirty_dentries(member_offset(CDentry, item_dirty)),
+    open_files(member_offset(CInode, item_open_file)),
+    renamed_files(member_offset(CInode, item_renamed_file)),
+    dirty_dirfrag_dir(member_offset(CInode, item_dirty_dirfrag_dir)),
+    dirty_dirfrag_nest(member_offset(CInode, item_dirty_dirfrag_nest)),
+    dirty_dirfrag_dirfragtree(member_offset(CInode, item_dirty_dirfrag_dirfragtree)),
     slave_updates(0), // passed to begin() manually
     inotablev(0), sessionmapv(0)
   { }

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index eb1727dd23303e9ee6f36efe0689c21c41e33d16..accdc87a1f27108dc0240664e7c1afaeebe93a3b 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -206,7 +206,7 @@ void MDCache::remove_inode(CInode *o)
   if (o->is_dirty())
     o->mark_clean();
 
-  o->dlist_open_file.remove_myself();
+  o->item_open_file.remove_myself();
 
   // remove from inode map
   inode_map.erase(o->vino());    
@@ -1306,7 +1306,7 @@ CInode *MDCache::cow_inode(CInode *in, snapid_t last)
       // clone to oldin
       client_t client = p->first;
       Capability *newcap = oldin->add_client_cap(client, 0, in->containing_realm);
-      cap->session_caps_item.get_list()->push_back(&newcap->session_caps_item);
+      cap->item_session_caps.get_list()->push_back(&newcap->item_session_caps);
       newcap->issue(cap->issued());
       newcap->set_last_issue_stamp(cap->get_last_issue_stamp());
       newcap->client_follows = cap->client_follows;
@@ -1798,7 +1798,7 @@ void MDCache::predirty_journal_parents(Mutation *mut, EMetaBlob *blob,
     if (stop) {
       dout(10) << "predirty_journal_parents stop.  marking nestlock on " << *pin << dendl;
       mds->locker->mark_updated_scatterlock(&pin->nestlock);
-      mut->ls->dirty_dirfrag_nest.push_back(&pin->dlist_dirty_dirfrag_nest);
+      mut->ls->dirty_dirfrag_nest.push_back(&pin->item_dirty_dirfrag_nest);
       mut->add_updated_lock(&pin->nestlock);
       break;
     }
@@ -4045,13 +4045,13 @@ void MDCache::clean_open_file_lists()
        p++) {
     LogSegment *ls = p->second;
     
-    elist<CInode*>::iterator q = ls->open_files.begin(member_offset(CInode, dlist_open_file));
+    elist<CInode*>::iterator q = ls->open_files.begin(member_offset(CInode, item_open_file));
     while (!q.end()) {
       CInode *in = *q;
       ++q;
       if (!in->is_any_caps_wanted()) {
        dout(10) << " unlisting unwanted/capless inode " << *in << dendl;
-       in->dlist_open_file.remove_myself();
+       in->item_open_file.remove_myself();
       }
     }
   }
@@ -6373,7 +6373,7 @@ void MDCache::request_forward(MDRequest *mdr, int who, int port)
 void MDCache::dispatch_request(MDRequest *mdr)
 {
   if (mdr->client_request) {
-    if (!mdr->session_request_item.is_on_list()) {
+    if (!mdr->item_session_request.is_on_list()) {
       dout(10) << "request " << *mdr << " is canceled" << dendl;
       return;
     }
@@ -6452,7 +6452,7 @@ void MDCache::request_cleanup(MDRequest *mdr)
   mdr->drop_pins();
 
   // remove from session
-  mdr->session_request_item.remove_myself();
+  mdr->item_session_request.remove_myself();
 
   bool was_replay = mdr->client_request && mdr->client_request->is_replay();
 
@@ -6725,7 +6725,7 @@ void MDCache::do_realm_invalidate_and_update_notify(CInode *in, int snapop)
 
   if (snapop == CEPH_SNAP_OP_SPLIT) {
     // notify clients of update|split
-    for (elist<CInode*>::iterator p = in->snaprealm->inodes_with_caps.begin(member_offset(CInode, dlist_caps));
+    for (elist<CInode*>::iterator p = in->snaprealm->inodes_with_caps.begin(member_offset(CInode, item_caps));
         !p.end(); ++p)
       split_inos.push_back((*p)->ino());
     
@@ -8382,17 +8382,17 @@ void MDCache::fragment_stored(MDRequest *mdr)
 
   // dft lock
   mds->locker->mark_updated_scatterlock(&diri->dirfragtreelock);
-  mdr->ls->dirty_dirfrag_dirfragtree.push_back(&diri->dlist_dirty_dirfrag_dirfragtree);
+  mdr->ls->dirty_dirfrag_dirfragtree.push_back(&diri->item_dirty_dirfrag_dirfragtree);
   mdr->add_updated_lock(&diri->dirfragtreelock);
 
   // filelock
   mds->locker->mark_updated_scatterlock(&diri->filelock);
-  mdr->ls->dirty_dirfrag_dir.push_back(&diri->dlist_dirty_dirfrag_dir);
+  mdr->ls->dirty_dirfrag_dir.push_back(&diri->item_dirty_dirfrag_dir);
   mdr->add_updated_lock(&diri->filelock);
 
   // dirlock
   mds->locker->mark_updated_scatterlock(&diri->nestlock);
-  mdr->ls->dirty_dirfrag_nest.push_back(&diri->dlist_dirty_dirfrag_nest);
+  mdr->ls->dirty_dirfrag_nest.push_back(&diri->item_dirty_dirfrag_nest);
   mdr->add_updated_lock(&diri->nestlock);
 
   // journal new dirfrag fragstats for each new fragment.

diff --git a/src/mds/MDCache.h b/src/mds/MDCache.h
index bc16183c39cf9a5aa181c8da7a1f0ca9496f3b6a..0646aaa79af56106346d50d6c526af2b74fcd3a6 100644 (file)
--- a/src/mds/MDCache.h
+++ b/src/mds/MDCache.h
@@ -256,7 +256,7 @@ enum {
 struct MDRequest : public Mutation {
   int ref;
   Session *session;
-  elist<MDRequest*>::item session_request_item;  // if not on list, op is aborted.
+  elist<MDRequest*>::item item_session_request;  // if not on list, op is aborted.
 
   // -- i am a client (master) request
   MClientRequest *client_request; // client request (if any)
@@ -333,7 +333,7 @@ struct MDRequest : public Mutation {
   // ---------------------------------------------------
   MDRequest() : 
     ref(1),
-    session(0), session_request_item(this),
+    session(0), item_session_request(this),
     client_request(0), snapid(CEPH_NOSNAP), tracei(0), tracedn(0),
     alloc_ino(0), used_prealloc_ino(0), snap_caps(0), did_early_reply(false),
     slave_request(0),
@@ -344,7 +344,7 @@ struct MDRequest : public Mutation {
   MDRequest(metareqid_t ri, MClientRequest *req) : 
     Mutation(ri),
     ref(1),
-    session(0), session_request_item(this),
+    session(0), item_session_request(this),
     client_request(req), snapid(CEPH_NOSNAP), tracei(0), tracedn(0),
     alloc_ino(0), used_prealloc_ino(0), snap_caps(0), did_early_reply(false),
     slave_request(0),
@@ -355,7 +355,7 @@ struct MDRequest : public Mutation {
   MDRequest(metareqid_t ri, int by) : 
     Mutation(ri, by),
     ref(1),
-    session(0), session_request_item(this),
+    session(0), item_session_request(this),
     client_request(0), snapid(CEPH_NOSNAP), tracei(0), tracedn(0),
     alloc_ino(0), used_prealloc_ino(0), snap_caps(0), did_early_reply(false),
     slave_request(0),
@@ -408,14 +408,14 @@ struct MDRequest : public Mutation {
 struct MDSlaveUpdate {
   int origop;
   bufferlist rollback;
-  elist<MDSlaveUpdate*>::item dlistitem;
+  elist<MDSlaveUpdate*>::item item;
   Context *waiter;
   MDSlaveUpdate(int oo, bufferlist &rbl, elist<MDSlaveUpdate*> &list) :
     origop(oo),
-    dlistitem(this),
+    item(this),
     waiter(0) {
     rollback.claim(rbl);
-    list.push_back(&dlistitem);
+    list.push_back(&item);
   }
   ~MDSlaveUpdate() {
     if (waiter) waiter->finish(0);
@@ -461,7 +461,7 @@ protected:
   xlist<ClientLease*> client_leases[client_lease_pools];
 public:
   void touch_client_lease(ClientLease *r, int pool, utime_t ttl) {
-    client_leases[pool].push_back(&r->lease_item);
+    client_leases[pool].push_back(&r->item_lease);
     r->ttl = ttl;
   }
 

diff --git a/src/mds/ScatterLock.h b/src/mds/ScatterLock.h
index 50eb647cc31c5f5f06fba9c62d9727eee2aad445..d6cebc075048f5abda968e2b0e53f294775d4709 100644 (file)
--- a/src/mds/ScatterLock.h
+++ b/src/mds/ScatterLock.h
@@ -23,19 +23,19 @@ class ScatterLock : public SimpleLock {
     bool dirty, flushing;
     bool scatter_wanted;
     utime_t last_scatter;
-    xlist<ScatterLock*>::item xlistitem_updated;
+    xlist<ScatterLock*>::item item_updated;
     utime_t update_stamp;
 
     more_bits_t(ScatterLock *lock) :
       dirty(false), flushing(false), scatter_wanted(false),
-      xlistitem_updated(lock)
+      item_updated(lock)
     {}
 
     bool empty() {
       return dirty == false &&
        flushing == false &&
        scatter_wanted == false &&
-       !xlistitem_updated.is_on_list();
+       !item_updated.is_on_list();
     }
   };
   more_bits_t *_more;
@@ -59,12 +59,12 @@ public:
   {}
   ~ScatterLock() {
     if (_more) {
-      _more->xlistitem_updated.remove_myself();   // FIXME this should happen sooner, i think...
+      _more->item_updated.remove_myself();   // FIXME this should happen sooner, i think...
       delete _more;
     }
   }
 
-  xlist<ScatterLock*>::item *get_updated_item() { return &more()->xlistitem_updated; }
+  xlist<ScatterLock*>::item *get_updated_item() { return &more()->item_updated; }
   utime_t get_update_stamp() { return more()->update_stamp; }
   void set_update_stamp(utime_t t) { more()->update_stamp = t; }
 

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index d4e01b3c4e995fcbda46b0e39b256e753c451d03..efe5da438b3d58483a152ab33bc2637ab795acb4 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -286,7 +286,7 @@ void Server::_session_logged(Session *session, __u64 state_seq, bool open, versi
     }
     while (!session->requests.empty()) {
       MDRequest *mdr = session->requests.front(member_offset(MDRequest,
-                                                            session_request_item));
+                                                            item_session_request));
       mdcache->request_kill(mdr);
     }
     
@@ -1023,7 +1023,7 @@ void Server::handle_client_request(MClientRequest *req)
     return;
   if (session) {
     mdr->session = session;
-    session->requests.push_back(&mdr->session_request_item);
+    session->requests.push_back(&mdr->item_session_request);
   }
 
   // process embedded cap releases?
@@ -2112,12 +2112,12 @@ void Server::handle_client_open(MDRequest *mdr)
     mds->locker->check_inode_max_size(cur);
 
   // make sure this inode gets into the journal
-  if (!cur->dlist_open_file.is_on_list()) {
+  if (!cur->item_open_file.is_on_list()) {
     LogSegment *ls = mds->mdlog->get_current_segment();
     EOpen *le = new EOpen(mds->mdlog);
     mdlog->start_entry(le);
     le->add_clean_inode(cur);
-    ls->open_files.push_back(&cur->dlist_open_file);
+    ls->open_files.push_back(&cur->item_open_file);
     mds->mdlog->submit_entry(le);
   }
   
@@ -2257,7 +2257,7 @@ void Server::handle_client_openc(MDRequest *mdr)
   // make sure this inode gets into the journal
   le->metablob.add_opened_ino(in->ino());
   LogSegment *ls = mds->mdlog->get_current_segment();
-  ls->open_files.push_back(&in->dlist_open_file);
+  ls->open_files.push_back(&in->item_open_file);
 
   C_MDS_openc_finish *fin = new C_MDS_openc_finish(mds, mdr, dn, in, follows);
   journal_and_reply(mdr, in, dn, le, fin);
@@ -2633,7 +2633,7 @@ void Server::handle_client_opent(MDRequest *mdr, int cmode)
   // make sure ino gets into the journal
   le->metablob.add_opened_ino(in->ino());
   LogSegment *ls = mds->mdlog->get_current_segment();
-  ls->open_files.push_back(&in->dlist_open_file);
+  ls->open_files.push_back(&in->item_open_file);
   
   journal_and_reply(mdr, in, 0, le, new C_MDS_inode_update_finish(mds, mdr, in, true));
 }
@@ -2989,7 +2989,7 @@ void Server::handle_client_mkdir(MDRequest *mdr)
   // make sure this inode gets into the journal
   le->metablob.add_opened_ino(newi->ino());
   LogSegment *ls = mds->mdlog->get_current_segment();
-  ls->open_files.push_back(&newi->dlist_open_file);
+  ls->open_files.push_back(&newi->item_open_file);
 
   journal_and_reply(mdr, newi, dn, le, new C_MDS_mknod_finish(mds, mdr, dn, newi, follows));
 }
@@ -4648,7 +4648,7 @@ void Server::_rename_apply(MDRequest *mdr, CDentry *srcdn, CDentry *destdn, CDen
 
       
       if (desti->is_dir()) {
-       mdr->ls->renamed_files.push_back(&desti->dlist_renamed_file);
+       mdr->ls->renamed_files.push_back(&desti->item_renamed_file);
        desti->state_set(CInode::STATE_DIRTYPARENT);
        dout(10) << "added dir to logsegment renamed_files list " << *desti << dendl;
       }

diff --git a/src/mds/SessionMap.h b/src/mds/SessionMap.h
index 2a99a631dc20021d2a10fb5f07f924a3d02293ad..eca1a0e752fd2a653ec73263323ff5726fd82459 100644 (file)
--- a/src/mds/SessionMap.h
+++ b/src/mds/SessionMap.h
@@ -70,7 +70,7 @@ private:
   friend class SessionMap;
 public:
   entity_inst_t inst;
-  xlist<Session*>::item session_list_item;
+  xlist<Session*>::item item_session_list;
 
   elist<MDRequest*> requests;
 
@@ -130,10 +130,10 @@ public:
   version_t get_push_seq() const { return cap_push_seq; }
 
   void add_cap(Capability *cap) {
-    caps.push_back(&cap->session_caps_item);
+    caps.push_back(&cap->item_session_caps);
   }
   void touch_lease(ClientLease *r) {
-    leases.push_back(&r->session_lease_item);
+    leases.push_back(&r->item_session_lease);
   }
 
   // -- completed requests --
@@ -157,11 +157,11 @@ public:
 
   Session() : 
     state(STATE_NEW), state_seq(0),
-    session_list_item(this),
+    item_session_list(this),
     requests(0),  // member_offset passed to front() manually
     cap_push_seq(0) { }
   ~Session() {
-    assert(!session_list_item.is_on_list());
+    assert(!item_session_list.is_on_list());
   }
 
   void clear() {
@@ -241,18 +241,18 @@ public:
   void add_session(Session *s) {
     assert(session_map.count(s->inst.name) == 0);
     session_map[s->inst.name] = s;
-    by_state[s->state].push_back(&s->session_list_item);
+    by_state[s->state].push_back(&s->item_session_list);
     s->get();
   }
   void remove_session(Session *s) {
     s->trim_completed_requests(0);
-    s->session_list_item.remove_myself();
+    s->item_session_list.remove_myself();
     session_map.erase(s->inst.name);
     s->put();
   }
   void touch_session(Session *session) {
-    if (session->session_list_item.is_on_list()) {
-      by_state[session->state].push_back(&session->session_list_item);
+    if (session->item_session_list.is_on_list()) {
+      by_state[session->state].push_back(&session->item_session_list);
       session->last_cap_renew = g_clock.now();
     } else {
       assert(0);  // hrm, should happen?
@@ -266,7 +266,7 @@ public:
     if (session->state != s) {
       session->state = s;
       session->state_seq++;
-      by_state[s].push_back(&session->session_list_item);
+      by_state[s].push_back(&session->item_session_list);
     }
     return session->state_seq;
   }

diff --git a/src/mds/journal.cc b/src/mds/journal.cc
index d76dddfc8f03957013b863dd43eeb01d6742bad9..4a4b8a9642bf3b10de0570029b43238ac3f72c25 100644 (file)
--- a/src/mds/journal.cc
+++ b/src/mds/journal.cc
@@ -158,7 +158,7 @@ C_Gather *LogSegment::try_to_expire(MDS *mds)
     EOpen *le = 0;
     LogSegment *ls = mds->mdlog->get_current_segment();
     assert(ls != this);
-    elist<CInode*>::iterator p = open_files.begin(member_offset(CInode, dlist_open_file));
+    elist<CInode*>::iterator p = open_files.begin(member_offset(CInode, item_open_file));
     while (!p.end()) {
       CInode *in = *p;
       ++p;
@@ -170,11 +170,11 @@ C_Gather *LogSegment::try_to_expire(MDS *mds)
            mds->mdlog->start_entry(le);
          }
          le->add_clean_inode(in);
-         ls->open_files.push_back(&in->dlist_open_file);
+         ls->open_files.push_back(&in->item_open_file);
        } else {
          // drop inodes that aren't wanted
          dout(20) << "try_to_expire not requeueing and delisting unwanted file " << *in << dendl;
-         in->dlist_open_file.remove_myself();
+         in->item_open_file.remove_myself();
        }
       } else {
        /*
@@ -187,7 +187,7 @@ C_Gather *LogSegment::try_to_expire(MDS *mds)
         * make it easier to miss subtle problems.
         */
        dout(20) << "try_to_expire not requeueing and delisting capless file " << *in << dendl;
-       in->dlist_open_file.remove_myself();
+       in->item_open_file.remove_myself();
       }
     }
     if (le) {
@@ -208,7 +208,7 @@ C_Gather *LogSegment::try_to_expire(MDS *mds)
 
   // slave updates
   for (elist<MDSlaveUpdate*>::iterator p = slave_updates.begin(member_offset(MDSlaveUpdate,
-                                                                            dlistitem));
+                                                                            item));
        !p.end(); ++p) {
     MDSlaveUpdate *su = *p;
     dout(10) << "try_to_expire waiting on slave update " << su << dendl;
@@ -431,7 +431,7 @@ void EMetaBlob::replay(MDS *mds, LogSegment *logseg)
          !(dir->fnode.fragstat == dir->fnode.accounted_fragstat)) {
        dout(10) << "EMetaBlob.replay      dirty nestinfo on " << *dir << dendl;
        mds->locker->mark_updated_scatterlock(&dir->inode->nestlock);
-       logseg->dirty_dirfrag_nest.push_back(&dir->inode->dlist_dirty_dirfrag_nest);
+       logseg->dirty_dirfrag_nest.push_back(&dir->inode->item_dirty_dirfrag_nest);
       } else {
        dout(10) << "EMetaBlob.replay      clean nestinfo on " << *dir << dendl;
       }
@@ -580,7 +580,7 @@ void EMetaBlob::replay(MDS *mds, LogSegment *logseg)
     CInode *in = mds->mdcache->get_inode(opened_ino);
     assert(in);
     dout(10) << "EMetaBlob.replay noting opened inode " << *in << dendl;
-    logseg->open_files.push_back(&in->dlist_open_file);
+    logseg->open_files.push_back(&in->item_open_file);
   }
 
   // allocated_inos
@@ -896,7 +896,7 @@ void EOpen::replay(MDS *mds)
        p++) {
     CInode *in = mds->mdcache->get_inode(*p);
     assert(in); 
-    _segment->open_files.push_back(&in->dlist_open_file);
+    _segment->open_files.push_back(&in->item_open_file);
   }
 }
 

diff --git a/src/mds/mdstypes.h b/src/mds/mdstypes.h
index d7282cfaac5284827588224785c5095dc7f50584..264c75328d5777a44ced6773c0ec14503831878d 100644 (file)
--- a/src/mds/mdstypes.h
+++ b/src/mds/mdstypes.h
@@ -1042,13 +1042,13 @@ struct ClientLease {
 
   ceph_seq_t seq;
   utime_t ttl;
-  xlist<ClientLease*>::item session_lease_item; // per-session list
-  xlist<ClientLease*>::item lease_item;         // global list
+  xlist<ClientLease*>::item item_session_lease; // per-session list
+  xlist<ClientLease*>::item item_lease;         // global list
 
   ClientLease(client_t c, MDSCacheObject *p) : 
     client(c), mask(0), parent(p), seq(0),
-    session_lease_item(this),
-    lease_item(this) { }
+    item_session_lease(this),
+    item_lease(this) { }
 };
 
 

diff --git a/src/mds/snap.cc b/src/mds/snap.cc
index 637bcbf6df1fbad7d6b89a98df166a480da55582..c25d591019d6051347c7a4ec9ad5b19315cee681 100644 (file)
--- a/src/mds/snap.cc
+++ b/src/mds/snap.cc
@@ -378,7 +378,7 @@ void SnapRealm::split_at(SnapRealm *child)
   }
 
   // split inodes_with_caps
-  elist<CInode*>::iterator p = inodes_with_caps.begin(member_offset(CInode, dlist_caps));
+  elist<CInode*>::iterator p = inodes_with_caps.begin(member_offset(CInode, item_caps));
   while (!p.end()) {
     CInode *in = *p;
     ++p;

diff --git a/src/mds/snap.h b/src/mds/snap.h
index 6f787756732896c5db3fb1c8c4cb2fc47ac0e3f3..9f2c6fbd49b08f1793debe895dd252f6c05528e5 100644 (file)
--- a/src/mds/snap.h
+++ b/src/mds/snap.h
@@ -224,10 +224,10 @@ struct SnapRealm {
   void join(SnapRealm *child);
 
   void add_cap(client_t client, Capability *cap) {
-    client_caps[client].push_back(&cap->snaprealm_caps_item);
+    client_caps[client].push_back(&cap->item_snaprealm_caps);
   }
   void remove_cap(client_t client, Capability *cap) {
-    cap->snaprealm_caps_item.remove_myself();
+    cap->item_snaprealm_caps.remove_myself();
     if (client_caps[client].empty())
       client_caps.erase(client);
   }