mds: don't rejournal files with caps that are unwanted

If they're unwanted, it's no biggie to fail to reconnect the cap.  And
Locker::adjust_cap_wanted() already adjusts the open_file logseg lists in
this way, so let's just totally consistent.

diff --git a/src/mds/journal.cc b/src/mds/journal.cc
index fe33f519a97776e1f71bd12f4ad21037f50d0752..6bb921a75cc73b501a221814d497a6f3633bf54c 100644 (file)
--- a/src/mds/journal.cc
+++ b/src/mds/journal.cc
@@ -163,10 +163,16 @@ C_Gather *LogSegment::try_to_expire(MDS *mds)
       CInode *in = *p;
       ++p;
       if (in->is_any_caps()) {
-       dout(20) << "try_to_expire requeueing open file " << *in << dendl;
-       if (!le) le = new EOpen(mds->mdlog);
-       le->add_clean_inode(in);
-       ls->open_files.push_back(&in->xlist_open_file);
+       if (in->get_caps_wanted()) {
+         dout(20) << "try_to_expire requeueing open file " << *in << dendl;
+         if (!le) le = new EOpen(mds->mdlog);
+         le->add_clean_inode(in);
+         ls->open_files.push_back(&in->xlist_open_file);
+       } else {
+         // drop inodes that aren't wanted
+         dout(20) << "try_to_expire not requeueing and delisting unwanted file " << *in << dendl;
+         in->xlist_open_file.remove_myself();
+       }
       } else {
        /*
         * we can get a capless inode here if we replay an open file, the client fails to