mds: kill old rdcaps_ttl business

This was from when caps independently timed out.

diff --git a/src/TODO b/src/TODO
index 55b53b7be4cb495399764ff4e5147d4ff03aa959..6263b25cca8de17643a9962224f88c1d03a88cbd 100644 (file)
--- a/src/TODO
+++ b/src/TODO
@@ -29,6 +29,7 @@ v0.16
 - ceph_buffer and vmalloc?
 - ceph_i_test
 - bit ops in messenger
+- name args in ceph_osd_op union
 
 bugs
 - mislinked directory?

diff --git a/src/config.cc b/src/config.cc
index eb9d25c08947bc2615cc1b7e5ac92664233f5990..419c639a36e2f4525188c2b5f4ae806d1c4af309 100644 (file)
--- a/src/config.cc
+++ b/src/config.cc
@@ -414,7 +414,6 @@ static struct config_option config_optionsp[] = {
        OPTION(mds_client_prealloc_inos, 0, OPT_INT, 1000),
        OPTION(mds_early_reply, 0, OPT_BOOL, true),
        OPTION(mds_short_reply_trace, 0, OPT_BOOL, true),
-       OPTION(mds_rdcap_ttl_ms, 0, OPT_INT, 60*1000),
        OPTION(mds_use_tmap, 0, OPT_BOOL, true),        // use trivialmap for dir updates
        OPTION(mds_log, 0, OPT_BOOL, true),
        OPTION(mds_log_unsafe, 0, OPT_BOOL, false),      // only wait for log sync, when it's mostly safe to do so

diff --git a/src/config.h b/src/config.h
index 940df11fc21e7ddacff33a2a7389c3ce6a1ed5d6..3b9a0824e8df215f4eb6f2524ef629297934c635 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -207,7 +207,6 @@ struct md_config_t {
   bool mds_early_reply;
   bool mds_short_reply_trace;
 
-  int mds_rdcap_ttl_ms;
   bool mds_use_tmap;
 
   bool mds_log;

diff --git a/src/kernel/caps.c b/src/kernel/caps.c
index f5af1a4098ac9dd916e7c7b92d332dbf0f770fad..7938f38fa4cbc09db3dd09ca94c247ba6f2f7926 100644 (file)
--- a/src/kernel/caps.c
+++ b/src/kernel/caps.c
@@ -501,8 +501,7 @@ static void __check_cap_issue(struct ceph_inode_info *ci, struct ceph_cap *cap,
 int ceph_add_cap(struct inode *inode,
                 struct ceph_mds_session *session, u64 cap_id,
                 int fmode, unsigned issued, unsigned wanted,
-                unsigned seq, unsigned mseq, u64 realmino,
-                unsigned ttl_ms, unsigned long ttl_from, int flags,
+                unsigned seq, unsigned mseq, u64 realmino, int flags,
                 struct ceph_cap_reservation *caps_reservation)
 {
        struct ceph_mds_client *mdsc = &ceph_inode_to_client(inode)->mdsc;
@@ -2548,8 +2547,7 @@ static void handle_cap_import(struct ceph_mds_client *mdsc,
                               false);
        downgrade_write(&mdsc->snap_rwsem);
        ceph_add_cap(inode, session, cap_id, -1,
-                    issued, wanted, seq, mseq, realmino,
-                    ttl_ms, jiffies - ttl_ms/2, CEPH_CAP_FLAG_AUTH,
+                    issued, wanted, seq, mseq, realmino, CEPH_CAP_FLAG_AUTH,
                     NULL /* no caps context */);
        try_flush_caps(inode, session, NULL);
        up_read(&mdsc->snap_rwsem);

diff --git a/src/kernel/inode.c b/src/kernel/inode.c
index aa5763d639dbfb0eacc67b16d43b839888a43420..340d96f035c6dc3df90f8293218184ec3123bdd2 100644 (file)
--- a/src/kernel/inode.c
+++ b/src/kernel/inode.c
@@ -695,8 +695,6 @@ no_change:
                                     le32_to_cpu(info->cap.seq),
                                     le32_to_cpu(info->cap.mseq),
                                     le64_to_cpu(info->cap.realm),
-                                    le32_to_cpu(info->cap.ttl_ms),
-                                    ttl_from,
                                     info->cap.flags,
                                     caps_reservation);
                } else {

diff --git a/src/kernel/super.h b/src/kernel/super.h
index 7fa9f0b823947f4d458be596eea2b0b27d9c8dd2..b88551cc91190b8c5889e42bc9da9dcfca7020e4 100644 (file)
--- a/src/kernel/super.h
+++ b/src/kernel/super.h
@@ -789,8 +789,7 @@ extern void ceph_handle_caps(struct ceph_mds_session *session,
 extern int ceph_add_cap(struct inode *inode,
                        struct ceph_mds_session *session, u64 cap_id,
                        int fmode, unsigned issued, unsigned wanted,
-                       unsigned cap, unsigned seq, u64 realmino,
-                       unsigned ttl_ms, unsigned long ttl_from, int flags,
+                       unsigned cap, unsigned seq, u64 realmino, int flags,
                        struct ceph_cap_reservation *caps_reservation);
 extern void __ceph_remove_cap(struct ceph_cap *cap,
                              struct ceph_cap_reservation *ctx);

diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
index ac7f83a55e0cffe39881e1beb630132ae03dee43..afe9e3fb0609b0cbeed0db096746cea17a6e3393 100644 (file)
--- a/src/mds/CInode.cc
+++ b/src/mds/CInode.cc
@@ -1702,14 +1702,12 @@ bool CInode::encode_inodestat(bufferlist& bl, Session *session,
       dout(10) << "encode_inodestat issueing " << ccap_string(issue) << " seq " << cap->get_last_seq() << dendl;
       e.cap.mseq = cap->get_mseq();
       e.cap.realm = find_snaprealm()->inode->ino();
-      e.cap.ttl_ms = g_conf.mds_rdcap_ttl_ms;
     } else {
       e.cap.caps = 0;
       e.cap.seq = 0;
       e.cap.mseq = 0;
       e.cap.realm = 0;
       e.cap.wanted = 0;
-      e.cap.ttl_ms = 0;
     }
   }
   e.cap.flags = is_auth() ? CEPH_CAP_FLAG_AUTH:0;

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index c6e2b9ce87c6f7551237930a8408140d156e6dee..daf68038d8d17962e187d31fd566a26c442927bd 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -4089,7 +4089,6 @@ void MDCache::do_cap_import(Session *session, CInode *in, Capability *cap)
                                        cap->pending(), cap->wanted(), 0,
                                        cap->get_mseq());
     in->encode_cap_message(reap, cap);
-    reap->head.ttl_ms = g_conf.mds_rdcap_ttl_ms;
     realm->build_snap_trace(reap->snapbl);
     mds->send_message_client(reap, session->inst);
   } else {