From: alex <alex>
Date: Fri, 24 Apr 2009 18:23:17 +0000 (+0000)
Subject:  - don't need old obd-related methods
X-Git-Tag: GIT_EPOCH_B_HD_KDMU~2^4~107
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=aa67bdc0b4c5e54b2e4b4a62748791674a647e61;p=fs%2Flustre-release.git

 - don't need old obd-related methods
---

diff --git a/lustre/ptlrpc/target.c b/lustre/ptlrpc/target.c
index 4fdd923..c702a75 100644
--- a/lustre/ptlrpc/target.c
+++ b/lustre/ptlrpc/target.c
@@ -42,103 +42,6 @@
 #include <obd.h>
 #include <lustre_fsfilt.h>
 /**
- * Update client data in last_rcvd file. An obd API
- */
-static int obt_client_data_update(struct obd_export *exp)
-{
-        struct lu_export_data *led = &exp->exp_target_data;
-        struct obd_device_target *obt = &exp->exp_obd->u.obt;
-        loff_t off = led->led_lr_off;
-        int rc = 0;
-
-        rc = fsfilt_write_record(exp->exp_obd, obt->obt_rcvd_filp,
-                                 led->led_lcd, sizeof(*led->led_lcd), &off, 0);
-
-        CDEBUG(D_INFO, "update client idx %u last_epoch %#x (%#x)\n",
-               led->led_lr_idx, le32_to_cpu(led->led_lcd->lcd_last_epoch),
-               le32_to_cpu(obt->obt_lsd->lsd_start_epoch));
-
-        return rc;
-}
-
-/**
- * Update server data in last_rcvd file. An obd API
- */
-int obt_server_data_update(struct obd_device *obd, int force_sync)
-{
-        struct obd_device_target *obt = &obd->u.obt;
-        loff_t off = 0;
-        int rc;
-        ENTRY;
-
-        CDEBUG(D_SUPER,
-               "%s: mount_count is "LPU64", last_transno is "LPU64"\n",
-               obt->obt_lsd->lsd_uuid,
-               le64_to_cpu(obt->obt_lsd->lsd_mount_count),
-               le64_to_cpu(obt->obt_lsd->lsd_last_transno));
-
-        rc = fsfilt_write_record(obd, obt->obt_rcvd_filp, obt->obt_lsd,
-                                 sizeof(*obt->obt_lsd), &off, force_sync);
-        if (rc)
-                CERROR("error writing lr_server_data: rc = %d\n", rc);
-
-        RETURN(rc);
-}
-
-/**
- * Update client epoch with server's one
- */
-void obt_client_epoch_update(struct obd_export *exp)
-{
-        struct lsd_client_data *lcd = exp->exp_target_data.led_lcd;
-        struct obd_device_target *obt = &exp->exp_obd->u.obt;
-
-        /** VBR: set client last_epoch to current epoch */
-        if (le32_to_cpu(lcd->lcd_last_epoch) >=
-            le32_to_cpu(obt->obt_lsd->lsd_start_epoch))
-                return;
-        lcd->lcd_last_epoch = obt->obt_lsd->lsd_start_epoch;
-        obt_client_data_update(exp);
-}
-
-/**
- * Increment server epoch. An obd API
- */
-static void obt_boot_epoch_update(struct obd_device *obd)
-{
-        __u32 start_epoch;
-        struct obd_device_target *obt = &obd->u.obt;
-        struct ptlrpc_request *req;
-        struct list_head client_list;
-
-        spin_lock(&obt->obt_translock);
-        start_epoch = lr_epoch(le64_to_cpu(obt->obt_last_transno)) + 1;
-        obt->obt_last_transno = cpu_to_le64((__u64)start_epoch <<
-                                            LR_EPOCH_BITS);
-        obt->obt_lsd->lsd_start_epoch = cpu_to_le32(start_epoch);
-        spin_unlock(&obt->obt_translock);
-
-        CFS_INIT_LIST_HEAD(&client_list);
-        spin_lock_bh(&obd->obd_processing_task_lock);
-        list_splice_init(&obd->obd_final_req_queue, &client_list);
-        spin_unlock_bh(&obd->obd_processing_task_lock);
-
-        /**
-         * go through list of exports participated in recovery and
-         * set new epoch for them
-         */
-        list_for_each_entry(req, &client_list, rq_list) {
-                LASSERT(!req->rq_export->exp_delayed);
-                obt_client_epoch_update(req->rq_export);
-        }
-        /** return list back at once */
-        spin_lock_bh(&obd->obd_processing_task_lock);
-        list_splice_init(&client_list, &obd->obd_final_req_queue);
-        spin_unlock_bh(&obd->obd_processing_task_lock);
-        obt_server_data_update(obd, 1);
-}
-
-/**
  * write data in last_rcvd file.
  */
 static int lut_last_rcvd_write(const struct lu_env *env, struct lu_target *lut,
@@ -249,9 +152,8 @@ void lut_boot_epoch_update(struct lu_target *lut)
 
         if (lut->lut_obd->obd_stopping)
                 return;
-        /** Increase server epoch after recovery */
-        if (lut->lut_bottom == NULL)
-                return obt_boot_epoch_update(lut->lut_obd);
+
+        LASSERT(lut->lut_bottom);
 
         rc = lu_env_init(&env, LCT_DT_THREAD);
         if (rc) {