LU-2104 recovery: keep valid obd_stale_clients during recovery

[fs/lustre-release.git] / lustre / ofd / ofd_obd.c

diff --git a/lustre/ofd/ofd_obd.c b/lustre/ofd/ofd_obd.c
index 2f255fe..d218018 100644 (file)
--- a/lustre/ofd/ofd_obd.c
+++ b/lustre/ofd/ofd_obd.c
@@ -514,6 +514,7 @@ static int ofd_set_info_async(const struct lu_env *env, struct obd_export *exp,
        } else if (KEY_IS(KEY_GRANT_SHRINK)) {
                struct ost_body *body = val;
 
+               ofd_info_init(env, exp);
                /** handle grant shrink, similar to a read request */
                ofd_grant_prepare_read(env, exp, &body->oa);
        } else {
@@ -1065,8 +1066,8 @@ static int ofd_orphans_destroy(const struct lu_env *env,
        skip_orphan = !!(exp->exp_connect_flags & OBD_CONNECT_SKIP_ORPHAN);
 
        last = ofd_last_id(ofd, oa->o_seq);
-       CWARN("%s: deleting orphan objects from "LPU64" to "LPU64"\n",
-             ofd_obd(ofd)->obd_name, oa->o_id + 1, last);
+       LCONSOLE_INFO("%s: deleting orphan objects from "LPU64" to "LPU64"\n",
+                     ofd_obd(ofd)->obd_name, oa->o_id + 1, last);
 
        for (oi.oi_id = last; oi.oi_id > oa->o_id; oi.oi_id--) {
                fid_ostid_unpack(&info->fti_fid, &oi, 0);
@@ -1456,23 +1457,6 @@ out:
        return !!rc;
 }
 
-static int ofd_obd_notify(struct obd_device *obd, struct obd_device *unused,
-                         enum obd_notify_event ev, void *data)
-{
-       switch (ev) {
-       case OBD_NOTIFY_CONFIG:
-               LASSERT(obd->obd_no_conn);
-               spin_lock(&obd->obd_dev_lock);
-               obd->obd_no_conn = 0;
-               spin_unlock(&obd->obd_dev_lock);
-               break;
-       default:
-               CDEBUG(D_INFO, "%s: Unhandled notification %#x\n",
-                      obd->obd_name, ev);
-       }
-       return 0;
-}
-
 /*
  * Handle quota control requests to consult current usage/limit.
  *
@@ -1526,6 +1510,5 @@ struct obd_ops ofd_obd_ops = {
        .o_precleanup           = ofd_precleanup,
        .o_ping                 = ofd_ping,
        .o_health_check         = ofd_health_check,
-       .o_notify               = ofd_obd_notify,
        .o_quotactl             = ofd_quotactl,
 };