capa_renew should increase the refc.

[fs/lustre-release.git] / lustre / mds / mds_capa.c

diff --git a/lustre/mds/mds_capa.c b/lustre/mds/mds_capa.c
index 26ea186..6f8d091 100644 (file)
--- a/lustre/mds/mds_capa.c
+++ b/lustre/mds/mds_capa.c
@@ -258,8 +258,6 @@ mds_update_capa_key(struct obd_device *obd, struct mds_capa_key *mkey,
         if (rc2)
                 GOTO(out, rc2);
         
-        CDEBUG(D_INFO, "wrote capa keyid %u\n", keyid);
-
         spin_lock(&mds_capa_lock);
         list_del_init(&CUR_CAPA_KEY_LIST(mds));
         mds->mds_capa_key_idx = to_update;
@@ -269,7 +267,7 @@ mds_update_capa_key(struct obd_device *obd, struct mds_capa_key *mkey,
         if (time_before(expiry, mds_eck_timer.expires) ||
             !timer_pending(&mds_eck_timer)) {
                 mod_timer(&mds_eck_timer, expiry);
-                CDEBUG(D_INFO, "mds_eck_timer %lu", expiry);
+                CDEBUG(D_INFO, "mds_eck_timer %lu\n", expiry);
         }
         spin_unlock(&mds_capa_lock);
 
@@ -535,7 +533,7 @@ int mds_pack_capa(struct obd_device *obd, struct mds_export_data *med,
         LASSERT(capa != NULL);
 
         ocapa = capa_get(req_capa->lc_uid, req_capa->lc_op, req_capa->lc_mdsid,
-                         req_capa->lc_ino, MDS_CAPA);
+                         req_capa->lc_ino, req_capa->lc_igen, MDS_CAPA);
         if (ocapa) {
                 expired = capa_is_to_expire(ocapa);
                 if (!expired) {
@@ -562,8 +560,10 @@ int mds_pack_capa(struct obd_device *obd, struct mds_export_data *med,
         ocapa = capa_renew(capa, MDS_CAPA);
         if (!ocapa)
                 rc = -ENOMEM;
+        capa_put(ocapa);
 out:
         if (rc == 0)
                 body->valid |= OBD_MD_CAPA;
         RETURN(rc);
 }
+