Whamcloud - gitweb
LU-3222 ofd: use of ofd_XXX helpers
[fs/lustre-release.git] / lustre / ofd / ofd_obd.c
index 6a1a3c7..4255c04 100644 (file)
@@ -27,7 +27,7 @@
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Whamcloud, Inc.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
 
 #define DEBUG_SUBSYSTEM S_FILTER
 
+#include <lustre/lustre_idl.h>
 #include "ofd_internal.h"
 #include <obd_cksum.h>
+#include <lustre_ioctl.h>
+#include <lustre_quota.h>
+#include <lustre_lfsck.h>
+
+static int ofd_export_stats_init(struct ofd_device *ofd,
+                                struct obd_export *exp, void *client_nid)
+{
+       struct obd_device       *obd = ofd_obd(ofd);
+       struct nid_stat         *stats;
+       int                      num_stats;
+       int                      rc, newnid = 0;
+
+       ENTRY;
+
+       LASSERT(obd->obd_uses_nid_stats);
+
+       if (obd_uuid_equals(&exp->exp_client_uuid, &obd->obd_uuid))
+               /* Self-export gets no proc entry */
+               RETURN(0);
+
+       rc = lprocfs_exp_setup(exp, client_nid, &newnid);
+       if (rc) {
+               /* Mask error for already created
+                * /proc entries */
+               if (rc == -EALREADY)
+                       rc = 0;
+               RETURN(rc);
+       }
+
+       if (newnid == 0)
+               RETURN(0);
+
+       stats = exp->exp_nid_stats;
+       LASSERT(stats != NULL);
+
+       num_stats = NUM_OBD_STATS + LPROC_OFD_STATS_LAST;
+
+       stats->nid_stats = lprocfs_alloc_stats(num_stats,
+                                              LPROCFS_STATS_FLAG_NOPERCPU);
+       if (stats->nid_stats == NULL)
+               return -ENOMEM;
+
+       lprocfs_init_ops_stats(LPROC_OFD_STATS_LAST, stats->nid_stats);
+       ofd_stats_counter_init(stats->nid_stats);
+       rc = lprocfs_register_stats(stats->nid_proc, "stats",
+                                   stats->nid_stats);
+       if (rc)
+               GOTO(clean, rc);
+
+       rc = lprocfs_nid_ldlm_stats_init(stats);
+       if (rc) {
+               lprocfs_free_stats(&stats->nid_stats);
+               GOTO(clean, rc);
+       }
+
+       RETURN(0);
+clean:
+       return rc;
+}
 
 static int ofd_parse_connect_data(const struct lu_env *env,
                                  struct obd_export *exp,
-                                 struct obd_connect_data *data)
+                                 struct obd_connect_data *data,
+                                 bool new_connection)
 {
        struct ofd_device                *ofd = ofd_exp(exp);
        struct filter_export_data        *fed = &exp->exp_filter_data;
@@ -56,10 +117,11 @@ static int ofd_parse_connect_data(const struct lu_env *env,
                RETURN(0);
 
        CDEBUG(D_RPCTRACE, "%s: cli %s/%p ocd_connect_flags: "LPX64
-              " ocd_version: %x ocd_grant: %d ocd_index: %u\n",
+              " ocd_version: %x ocd_grant: %d ocd_index: %u"
+              " ocd_group %u\n",
               exp->exp_obd->obd_name, exp->exp_client_uuid.uuid, exp,
               data->ocd_connect_flags, data->ocd_version,
-              data->ocd_grant, data->ocd_index);
+              data->ocd_grant, data->ocd_index, data->ocd_group);
 
        if (fed->fed_group != 0 && fed->fed_group != data->ocd_group) {
                CWARN("!!! This export (nid %s) used object group %d "
@@ -73,7 +135,6 @@ static int ofd_parse_connect_data(const struct lu_env *env,
        fed->fed_group = data->ocd_group;
 
        data->ocd_connect_flags &= OST_CONNECT_SUPPORTED;
-       exp->exp_connect_flags = data->ocd_connect_flags;
        data->ocd_version = LUSTRE_VERSION_CODE;
 
        /* Kindly make sure the SKIP_ORPHAN flag is from MDS. */
@@ -83,18 +144,24 @@ static int ofd_parse_connect_data(const struct lu_env *env,
        else if (data->ocd_connect_flags & OBD_CONNECT_SKIP_ORPHAN)
                RETURN(-EPROTO);
 
+       if (ofd_grant_param_supp(exp)) {
+               exp->exp_filter_data.fed_pagesize = data->ocd_blocksize;
+               /* ocd_{blocksize,inodespace} are log2 values */
+               data->ocd_blocksize  = ofd->ofd_blockbits;
+               data->ocd_inodespace = ofd->ofd_dt_conf.ddp_inodespace;
+               /* ocd_grant_extent is in 1K blocks */
+               data->ocd_grant_extent = ofd->ofd_dt_conf.ddp_grant_frag >> 10;
+       }
+
+       if (data->ocd_connect_flags & OBD_CONNECT_GRANT)
+               data->ocd_grant = ofd_grant_connect(env, exp, data->ocd_grant,
+                                                   new_connection);
+
        if (data->ocd_connect_flags & OBD_CONNECT_INDEX) {
                struct lr_server_data *lsd = &ofd->ofd_lut.lut_lsd;
-               int                    index = lsd->lsd_ost_index;
+               int                    index = lsd->lsd_osd_index;
 
-               if (!(lsd->lsd_feature_compat & OBD_COMPAT_OST)) {
-                       /* this will only happen on the first connect */
-                       lsd->lsd_ost_index = data->ocd_index;
-                       lsd->lsd_feature_compat |= OBD_COMPAT_OST;
-                       /* sync is not needed here as lut_client_add will
-                        * set exp_need_sync flag */
-                       lut_server_data_update(env, &ofd->ofd_lut, 0);
-               } else if (index != data->ocd_index) {
+               if (index != data->ocd_index) {
                        LCONSOLE_ERROR_MSG(0x136, "Connection from %s to index"
                                           " %u doesn't match actual OST index"
                                           " %u in last_rcvd file, bad "
@@ -103,13 +170,19 @@ static int ofd_parse_connect_data(const struct lu_env *env,
                                           data->ocd_index);
                        RETURN(-EBADF);
                }
+               if (!(lsd->lsd_feature_compat & OBD_COMPAT_OST)) {
+                       /* this will only happen on the first connect */
+                       lsd->lsd_feature_compat |= OBD_COMPAT_OST;
+                       /* sync is not needed here as lut_client_add will
+                        * set exp_need_sync flag */
+                       tgt_server_data_update(env, &ofd->ofd_lut, 0);
+               }
        }
-
        if (OBD_FAIL_CHECK(OBD_FAIL_OST_BRW_SIZE)) {
                data->ocd_brw_size = 65536;
        } else if (data->ocd_connect_flags & OBD_CONNECT_BRW_SIZE) {
                data->ocd_brw_size = min(data->ocd_brw_size,
-                             (__u32)(PTLRPC_MAX_BRW_PAGES << CFS_PAGE_SHIFT));
+                                        (__u32)DT_MAX_BRW_SIZE);
                if (data->ocd_brw_size == 0) {
                        CERROR("%s: cli %s/%p ocd_connect_flags: "LPX64
                               " ocd_version: %x ocd_grant: %d ocd_index: %u "
@@ -130,7 +203,7 @@ static int ofd_parse_connect_data(const struct lu_env *env,
                /* The client set in ocd_cksum_types the checksum types it
                 * supports. We have to mask off the algorithms that we don't
                 * support */
-               data->ocd_cksum_types &= cksum_types_supported();
+               data->ocd_cksum_types &= cksum_types_supported_server();
 
                if (unlikely(data->ocd_cksum_types == 0)) {
                        CERROR("%s: Connect with checksum support but no "
@@ -153,28 +226,36 @@ static int ofd_parse_connect_data(const struct lu_env *env,
        if (data->ocd_connect_flags & OBD_CONNECT_MAXBYTES)
                data->ocd_maxbytes = ofd->ofd_dt_conf.ddp_maxbytes;
 
-        RETURN(0);
+       if (OCD_HAS_FLAG(data, PINGLESS)) {
+               if (ptlrpc_pinger_suppress_pings()) {
+                       spin_lock(&exp->exp_obd->obd_dev_lock);
+                       list_del_init(&exp->exp_obd_chain_timed);
+                       spin_unlock(&exp->exp_obd->obd_dev_lock);
+               } else {
+                       data->ocd_connect_flags &= ~OBD_CONNECT_PINGLESS;
+               }
+       }
+
+       RETURN(0);
 }
 
 static int ofd_obd_reconnect(const struct lu_env *env, struct obd_export *exp,
                             struct obd_device *obd, struct obd_uuid *cluuid,
                             struct obd_connect_data *data, void *localdata)
 {
-       int rc;
+       struct ofd_device       *ofd;
+       int                      rc;
 
        ENTRY;
 
        if (exp == NULL || obd == NULL || cluuid == NULL)
                RETURN(-EINVAL);
 
-       rc = lu_env_refill((struct lu_env *)env);
-       if (rc != 0) {
-               CERROR("Failure to refill session: '%d'\n", rc);
-               RETURN(rc);
-       }
+       ofd = ofd_dev(obd->obd_lu_dev);
 
-       ofd_info_init(env, exp);
-       rc = ofd_parse_connect_data(env, exp, data);
+       rc = ofd_parse_connect_data(env, exp, data, false);
+       if (rc == 0)
+               ofd_export_stats_init(ofd, exp, localdata);
 
        RETURN(rc);
 }
@@ -186,8 +267,7 @@ static int ofd_obd_connect(const struct lu_env *env, struct obd_export **_exp,
        struct obd_export       *exp;
        struct ofd_device       *ofd;
        struct lustre_handle     conn = { 0 };
-       int                      rc, group;
-
+       int                      rc;
        ENTRY;
 
        if (_exp == NULL || obd == NULL || cluuid == NULL)
@@ -202,37 +282,24 @@ static int ofd_obd_connect(const struct lu_env *env, struct obd_export **_exp,
        exp = class_conn2export(&conn);
        LASSERT(exp != NULL);
 
-       rc = lu_env_refill((struct lu_env *)env);
-       if (rc != 0) {
-               CERROR("Failure to refill session: '%d'\n", rc);
-               GOTO(out, rc);
-       }
-
-       ofd_info_init(env, exp);
-
-       rc = ofd_parse_connect_data(env, exp, data);
+       rc = ofd_parse_connect_data(env, exp, data, true);
        if (rc)
                GOTO(out, rc);
 
-       ofd_export_stats_init(ofd, exp, localdata);
-       group = data->ocd_group;
        if (obd->obd_replayable) {
                struct tg_export_data *ted = &exp->exp_target_data;
 
                memcpy(ted->ted_lcd->lcd_uuid, cluuid,
                       sizeof(ted->ted_lcd->lcd_uuid));
-               rc = lut_client_new(env, exp);
+               rc = tgt_client_new(env, exp);
                if (rc != 0)
                        GOTO(out, rc);
+               ofd_export_stats_init(ofd, exp, localdata);
        }
-       if (group == 0)
-               GOTO(out, rc = 0);
 
-       /* init new group */
-       if (group > ofd->ofd_max_group) {
-               ofd->ofd_max_group = group;
-               rc = ofd_group_load(env, ofd, group);
-       }
+       CDEBUG(D_HA, "%s: get connection from MDS %d\n", obd->obd_name,
+              data ? data->ocd_group : -1);
+
 out:
        if (rc != 0) {
                class_disconnect(exp);
@@ -243,28 +310,35 @@ out:
        RETURN(rc);
 }
 
-static int ofd_obd_disconnect(struct obd_export *exp)
+int ofd_obd_disconnect(struct obd_export *exp)
 {
-       struct lu_env   env;
-       int             rc;
+       struct ofd_device       *ofd = ofd_exp(exp);
+       struct lu_env            env;
+       int                      rc;
 
        ENTRY;
 
        LASSERT(exp);
        class_export_get(exp);
 
+       if (!(exp->exp_flags & OBD_OPT_FORCE))
+               ofd_grant_sanity_check(ofd_obd(ofd), __FUNCTION__);
+
        rc = server_disconnect_export(exp);
 
-       rc = lu_env_init(&env, LCT_DT_THREAD);
-       if (rc)
-               RETURN(rc);
+       ofd_grant_discard(exp);
 
        /* Do not erase record for recoverable client. */
        if (exp->exp_obd->obd_replayable &&
-           (!exp->exp_obd->obd_fail || exp->exp_failed))
-               lut_client_del(&env, exp);
-       lu_env_fini(&env);
+           (!exp->exp_obd->obd_fail || exp->exp_failed)) {
+               rc = lu_env_init(&env, LCT_DT_THREAD);
+               if (rc)
+                       GOTO(out, rc);
 
+               tgt_client_del(&env, exp);
+               lu_env_fini(&env);
+       }
+out:
        class_export_put(exp);
        RETURN(rc);
 }
@@ -273,18 +347,19 @@ static int ofd_init_export(struct obd_export *exp)
 {
        int rc;
 
-       cfs_spin_lock_init(&exp->exp_filter_data.fed_lock);
+       spin_lock_init(&exp->exp_filter_data.fed_lock);
        CFS_INIT_LIST_HEAD(&exp->exp_filter_data.fed_mod_list);
-       cfs_spin_lock(&exp->exp_lock);
+       atomic_set(&exp->exp_filter_data.fed_soft_sync_count, 0);
+       spin_lock(&exp->exp_lock);
        exp->exp_connecting = 1;
-       cfs_spin_unlock(&exp->exp_lock);
+       spin_unlock(&exp->exp_lock);
 
        /* self-export doesn't need client data and ldlm initialization */
        if (unlikely(obd_uuid_equals(&exp->exp_obd->obd_uuid,
                                     &exp->exp_client_uuid)))
                return 0;
 
-       rc = lut_client_alloc(exp);
+       rc = tgt_client_alloc(exp);
        if (rc == 0)
                ldlm_init_export(exp);
        if (rc)
@@ -295,6 +370,8 @@ static int ofd_init_export(struct obd_export *exp)
 
 static int ofd_destroy_export(struct obd_export *exp)
 {
+       struct ofd_device *ofd = ofd_exp(exp);
+
        if (exp->exp_filter_data.fed_pending)
                CERROR("%s: cli %s/%p has %lu pending on destroyed export"
                       "\n", exp->exp_obd->obd_name, exp->exp_client_uuid.uuid,
@@ -307,12 +384,47 @@ static int ofd_destroy_export(struct obd_export *exp)
                return 0;
 
        ldlm_destroy_export(exp);
-       lut_client_free(exp);
+       tgt_client_free(exp);
+
+       ofd_fmd_cleanup(exp);
+
+       /*
+        * discard grants once we're sure no more
+        * interaction with the client is possible
+        */
+       ofd_grant_discard(exp);
+       ofd_fmd_cleanup(exp);
+
+       if (exp_connect_flags(exp) & OBD_CONNECT_GRANT_SHRINK) {
+               if (ofd->ofd_tot_granted_clients > 0)
+                       ofd->ofd_tot_granted_clients --;
+       }
+
+       if (!(exp->exp_flags & OBD_OPT_FORCE))
+               ofd_grant_sanity_check(exp->exp_obd, __FUNCTION__);
 
        LASSERT(cfs_list_empty(&exp->exp_filter_data.fed_mod_list));
        return 0;
 }
 
+int ofd_postrecov(const struct lu_env *env, struct ofd_device *ofd)
+{
+       struct lu_device *ldev = &ofd->ofd_dt_dev.dd_lu_dev;
+       struct lfsck_start_param lsp;
+       int rc;
+
+       CDEBUG(D_HA, "%s: recovery is over\n", ofd_name(ofd));
+
+       lsp.lsp_start = NULL;
+       lsp.lsp_index_valid = 0;
+       rc = lfsck_start(env, ofd->ofd_osd, &lsp);
+       if (rc != 0 && rc != -EALREADY)
+               CWARN("%s: auto trigger paused LFSCK failed: rc = %d\n",
+                     ofd_name(ofd), rc);
+
+       return ldev->ld_ops->ldo_recovery_complete(env, ldev);
+}
+
 int ofd_obd_postrecov(struct obd_device *obd)
 {
        struct lu_env            env;
@@ -326,28 +438,20 @@ int ofd_obd_postrecov(struct obd_device *obd)
                RETURN(rc);
        ofd_info_init(&env, obd->obd_self_export);
 
-       rc = ldev->ld_ops->ldo_recovery_complete(&env, ldev);
-       lu_env_fini(&env);
-       RETURN(rc);
-}
-
-static int ofd_set_mds_conn(struct obd_export *exp, void *val)
-{
-       int rc = 0;
+       rc = ofd_postrecov(&env, ofd_dev(ldev));
 
-       ENTRY;
-
-       LCONSOLE_WARN("%s: received MDS connection from %s\n",
-                     exp->exp_obd->obd_name, obd_export_nid2str(exp));
+       lu_env_fini(&env);
        RETURN(rc);
 }
 
+/* This is not called from request handler, check ofd_set_info_hdl() instead
+ * this OBD functions is only used by class_notify_sptlrpc_conf() locally
+ * by direct obd_set_info_async() call */
 static int ofd_set_info_async(const struct lu_env *env, struct obd_export *exp,
                              __u32 keylen, void *key, __u32 vallen, void *val,
                              struct ptlrpc_request_set *set)
 {
-       struct ofd_device       *ofd = ofd_exp(exp);
-       int                      rc = 0;
+       int rc = 0;
 
        ENTRY;
 
@@ -356,27 +460,26 @@ static int ofd_set_info_async(const struct lu_env *env, struct obd_export *exp,
                RETURN(-EINVAL);
        }
 
-       if (KEY_IS(KEY_CAPA_KEY)) {
-               rc = ofd_update_capa_key(ofd, val);
-               if (rc)
-                       CERROR("ofd update capability key failed: %d\n", rc);
-       } else if (KEY_IS(KEY_MDS_CONN)) {
-               rc = ofd_set_mds_conn(exp, val);
+       if (KEY_IS(KEY_SPTLRPC_CONF)) {
+               rc = tgt_adapt_sptlrpc_conf(class_exp2tgt(exp), 0);
        } else {
                CERROR("%s: Unsupported key %s\n",
                       exp->exp_obd->obd_name, (char*)key);
                rc = -EOPNOTSUPP;
        }
-
        RETURN(rc);
 }
 
+/* used by nrs_orr_range_fill_physical() in ptlrpc, see LU-3239 */
 static int ofd_get_info(const struct lu_env *env, struct obd_export *exp,
                        __u32 keylen, void *key, __u32 *vallen, void *val,
                        struct lov_stripe_md *lsm)
 {
-       struct ofd_device       *ofd = ofd_exp(exp);
-       int                      rc = 0;
+       struct ofd_thread_info          *info;
+       struct ofd_device               *ofd;
+       struct ll_fiemap_info_key       *fm_key = key;
+       struct ll_user_fiemap           *fiemap = val;
+       int                              rc = 0;
 
        ENTRY;
 
@@ -385,33 +488,19 @@ static int ofd_get_info(const struct lu_env *env, struct obd_export *exp,
                RETURN(-EINVAL);
        }
 
-       if (KEY_IS(KEY_BLOCKSIZE)) {
-               __u32 *blocksize = val;
-               if (blocksize) {
-                       if (*vallen < sizeof(*blocksize))
-                               RETURN(-EOVERFLOW);
-                       *blocksize = 1 << ofd->ofd_dt_conf.ddp_block_shift;
-               }
-               *vallen = sizeof(*blocksize);
-       } else if (KEY_IS(KEY_BLOCKSIZE_BITS)) {
-               __u32 *blocksize_bits = val;
-               if (blocksize_bits) {
-                       if (*vallen < sizeof(*blocksize_bits))
-                               RETURN(-EOVERFLOW);
-                       *blocksize_bits = ofd->ofd_dt_conf.ddp_block_shift;
-               }
-               *vallen = sizeof(*blocksize_bits);
-       } else if (KEY_IS(KEY_LAST_ID)) {
-               obd_id *last_id = val;
-               if (last_id) {
-                       if (*vallen < sizeof(*last_id))
-                               RETURN(-EOVERFLOW);
-                       *last_id = ofd_last_id(ofd,
-                                              exp->exp_filter_data.fed_group);
-               }
-               *vallen = sizeof(*last_id);
+       ofd = ofd_exp(exp);
+
+       if (KEY_IS(KEY_FIEMAP)) {
+               info = ofd_info_init(env, exp);
+
+               rc = ostid_to_fid(&info->fti_fid, &fm_key->oa.o_oi,
+                                 ofd->ofd_lut.lut_lsd.lsd_osd_index);
+               if (rc != 0)
+                       RETURN(rc);
+
+               rc = ofd_fiemap_get(env, ofd, &info->fti_fid, fiemap);
        } else {
-               CERROR("Not supported key %s\n", (char*)key);
+               CERROR("%s: not supported key %s\n", ofd_name(ofd), (char*)key);
                rc = -EOPNOTSUPP;
        }
 
@@ -422,19 +511,102 @@ static int ofd_get_info(const struct lu_env *env, struct obd_export *exp,
 int ofd_statfs_internal(const struct lu_env *env, struct ofd_device *ofd,
                         struct obd_statfs *osfs, __u64 max_age, int *from_cache)
 {
-       int rc;
+       int rc = 0;
+       ENTRY;
 
-       rc = dt_statfs(env, ofd->ofd_osd, osfs);
-       if (unlikely(rc))
-               return rc;
+       down_read(&ofd->ofd_lastid_rwsem);
+       /* Currently, for safe, we do not distinguish which LAST_ID is broken,
+        * we may do that in the future.
+        * Return -ENOSPC until the LAST_ID rebuilt. */
+       if (unlikely(ofd->ofd_lastid_rebuilding))
+               GOTO(out, rc = -ENOSPC);
+
+       spin_lock(&ofd->ofd_osfs_lock);
+       if (cfs_time_before_64(ofd->ofd_osfs_age, max_age) || max_age == 0) {
+               obd_size unstable;
+
+               /* statfs data are too old, get up-to-date one.
+                * we must be cautious here since multiple threads might be
+                * willing to update statfs data concurrently and we must
+                * grant that cached statfs data are always consistent */
+
+               if (ofd->ofd_statfs_inflight == 0)
+                       /* clear inflight counter if no users, although it would
+                        * take a while to overflow this 64-bit counter ... */
+                       ofd->ofd_osfs_inflight = 0;
+               /* notify ofd_grant_commit() that we want to track writes
+                * completed as of now */
+               ofd->ofd_statfs_inflight++;
+               /* record value of inflight counter before running statfs to
+                * compute the diff once statfs is completed */
+               unstable = ofd->ofd_osfs_inflight;
+               spin_unlock(&ofd->ofd_osfs_lock);
+
+               /* statfs can sleep ... hopefully not for too long since we can
+                * call it fairly often as space fills up */
+               rc = dt_statfs(env, ofd->ofd_osd, osfs);
+               if (unlikely(rc))
+                       GOTO(out, rc);
 
-       return 0;
+               spin_lock(&ofd->ofd_grant_lock);
+               spin_lock(&ofd->ofd_osfs_lock);
+               /* calculate how much space was written while we released the
+                * ofd_osfs_lock */
+               unstable = ofd->ofd_osfs_inflight - unstable;
+               ofd->ofd_osfs_unstable = 0;
+               if (unstable) {
+                       /* some writes completed while we were running statfs
+                        * w/o the ofd_osfs_lock. Those ones got added to
+                        * the cached statfs data that we are about to crunch.
+                        * Take them into account in the new statfs data */
+                       osfs->os_bavail -= min_t(obd_size, osfs->os_bavail,
+                                              unstable >> ofd->ofd_blockbits);
+                       /* However, we don't really know if those writes got
+                        * accounted in the statfs call, so tell
+                        * ofd_grant_space_left() there is some uncertainty
+                        * on the accounting of those writes.
+                        * The purpose is to prevent spurious error messages in
+                        * ofd_grant_space_left() since those writes might be
+                        * accounted twice. */
+                       ofd->ofd_osfs_unstable += unstable;
+               }
+               /* similarly, there is some uncertainty on write requests
+                * between prepare & commit */
+               ofd->ofd_osfs_unstable += ofd->ofd_tot_pending;
+               spin_unlock(&ofd->ofd_grant_lock);
+
+               /* finally udpate cached statfs data */
+               ofd->ofd_osfs = *osfs;
+               ofd->ofd_osfs_age = cfs_time_current_64();
+
+               ofd->ofd_statfs_inflight--; /* stop tracking */
+               if (ofd->ofd_statfs_inflight == 0)
+                       ofd->ofd_osfs_inflight = 0;
+               spin_unlock(&ofd->ofd_osfs_lock);
+
+               if (from_cache)
+                       *from_cache = 0;
+       } else {
+               /* use cached statfs data */
+               *osfs = ofd->ofd_osfs;
+               spin_unlock(&ofd->ofd_osfs_lock);
+               if (from_cache)
+                       *from_cache = 1;
+       }
+
+       GOTO(out, rc);
+
+out:
+       up_read(&ofd->ofd_lastid_rwsem);
+
+       return rc;
 }
 
-static int ofd_statfs(const struct lu_env *env,  struct obd_export *exp,
-                     struct obd_statfs *osfs, __u64 max_age, __u32 flags)
+int ofd_statfs(const struct lu_env *env,  struct obd_export *exp,
+              struct obd_statfs *osfs, __u64 max_age, __u32 flags)
 {
-       struct ofd_device       *ofd = ofd_dev(exp->exp_obd->obd_lu_dev);
+        struct obd_device      *obd = class_exp2obd(exp);
+       struct ofd_device       *ofd = ofd_exp(exp);
        int                      rc;
 
        ENTRY;
@@ -443,34 +615,383 @@ static int ofd_statfs(const struct lu_env *env,  struct obd_export *exp,
        if (unlikely(rc))
                GOTO(out, rc);
 
-       if (OBD_FAIL_CHECK_VALUE(OBD_FAIL_OST_ENOSPC,
-                                ofd->ofd_lut.lut_lsd.lsd_ost_index))
-               osfs->os_bfree = osfs->os_bavail = 2;
+       /* at least try to account for cached pages.  its still racy and
+        * might be under-reporting if clients haven't announced their
+        * caches with brw recently */
+
+       CDEBUG(D_SUPER | D_CACHE, "blocks cached "LPU64" granted "LPU64
+              " pending "LPU64" free "LPU64" avail "LPU64"\n",
+              ofd->ofd_tot_dirty, ofd->ofd_tot_granted, ofd->ofd_tot_pending,
+              osfs->os_bfree << ofd->ofd_blockbits,
+              osfs->os_bavail << ofd->ofd_blockbits);
+
+       osfs->os_bavail -= min_t(obd_size, osfs->os_bavail,
+                                ((ofd->ofd_tot_dirty + ofd->ofd_tot_pending +
+                                  osfs->os_bsize - 1) >> ofd->ofd_blockbits));
+
+       /* The QoS code on the MDS does not care about space reserved for
+        * precreate, so take it out. */
+       if (exp_connect_flags(exp) & OBD_CONNECT_MDS) {
+               struct filter_export_data *fed;
+
+               fed = &obd->obd_self_export->exp_filter_data;
+               osfs->os_bavail -= min_t(obd_size, osfs->os_bavail,
+                                        fed->fed_grant >> ofd->ofd_blockbits);
+       }
+
+       ofd_grant_sanity_check(obd, __FUNCTION__);
+       CDEBUG(D_CACHE, LPU64" blocks: "LPU64" free, "LPU64" avail; "
+              LPU64" objects: "LPU64" free; state %x\n",
+              osfs->os_blocks, osfs->os_bfree, osfs->os_bavail,
+              osfs->os_files, osfs->os_ffree, osfs->os_state);
 
        if (OBD_FAIL_CHECK_VALUE(OBD_FAIL_OST_ENOINO,
-                                ofd->ofd_lut.lut_lsd.lsd_ost_index))
+                                ofd->ofd_lut.lut_lsd.lsd_osd_index))
                osfs->os_ffree = 0;
+
+       /* OS_STATE_READONLY can be set by OSD already */
+       if (ofd->ofd_raid_degraded)
+               osfs->os_state |= OS_STATE_DEGRADED;
+
+       if (obd->obd_self_export != exp && ofd_grant_compat(exp, ofd)) {
+               /* clients which don't support OBD_CONNECT_GRANT_PARAM
+                * should not see a block size > page size, otherwise
+                * cl_lost_grant goes mad. Therefore, we emulate a 4KB (=2^12)
+                * block size which is the biggest block size known to work
+                * with all client's page size. */
+               osfs->os_blocks <<= ofd->ofd_blockbits - COMPAT_BSIZE_SHIFT;
+               osfs->os_bfree  <<= ofd->ofd_blockbits - COMPAT_BSIZE_SHIFT;
+               osfs->os_bavail <<= ofd->ofd_blockbits - COMPAT_BSIZE_SHIFT;
+               osfs->os_bsize    = 1 << COMPAT_BSIZE_SHIFT;
+       }
+
+       if (OBD_FAIL_CHECK_VALUE(OBD_FAIL_OST_ENOSPC,
+                                ofd->ofd_lut.lut_lsd.lsd_osd_index))
+               osfs->os_bfree = osfs->os_bavail = 2;
+
+       EXIT;
+out:
+       return rc;
+}
+
+/* needed by echo client only for now, RPC handler uses ofd_setattr_hdl() */
+int ofd_echo_setattr(const struct lu_env *env, struct obd_export *exp,
+                    struct obd_info *oinfo, struct obd_trans_info *oti)
+{
+       struct ofd_thread_info  *info;
+       struct ofd_device       *ofd = ofd_exp(exp);
+       struct ldlm_namespace   *ns = ofd->ofd_namespace;
+       struct ldlm_resource    *res;
+       struct ofd_object       *fo;
+       struct obdo             *oa = oinfo->oi_oa;
+       struct lu_fid           *fid = &oa->o_oi.oi_fid;
+       struct filter_fid       *ff = NULL;
+       int                      rc = 0;
+
+       ENTRY;
+
+       info = ofd_info_init(env, exp);
+
+       ost_fid_build_resid(fid, &info->fti_resid);
+
+       /* This would be very bad - accidentally truncating a file when
+        * changing the time or similar - bug 12203. */
+       if (oa->o_valid & OBD_MD_FLSIZE &&
+           oinfo->oi_policy.l_extent.end != OBD_OBJECT_EOF) {
+               static char mdsinum[48];
+
+               if (oa->o_valid & OBD_MD_FLFID)
+                       snprintf(mdsinum, sizeof(mdsinum) - 1,
+                                "of parent "DFID, oa->o_parent_seq,
+                                oa->o_parent_oid, 0);
+               else
+                       mdsinum[0] = '\0';
+
+               CERROR("%s: setattr from %s trying to truncate object "DFID
+                      " %s\n", ofd_name(ofd), obd_export_nid2str(exp),
+                      PFID(fid), mdsinum);
+               GOTO(out, rc = -EPERM);
+       }
+
+       fo = ofd_object_find_exists(env, ofd, fid);
+       if (IS_ERR(fo)) {
+               CERROR("%s: can't find object "DFID"\n",
+                      ofd_name(ofd), PFID(fid));
+               GOTO(out, rc = PTR_ERR(fo));
+       }
+
+       la_from_obdo(&info->fti_attr, oa, oa->o_valid);
+       info->fti_attr.la_valid &= ~LA_TYPE;
+
+       if (oa->o_valid & OBD_MD_FLFID) {
+               ff = &info->fti_mds_fid;
+               ofd_prepare_fidea(ff, oa);
+       }
+
+       /* setting objects attributes (including owner/group) */
+       rc = ofd_attr_set(env, fo, &info->fti_attr, ff);
+       if (rc)
+               GOTO(out_unlock, rc);
+
+       ofd_counter_incr(exp, LPROC_OFD_STATS_SETATTR, NULL, 1);
        EXIT;
+out_unlock:
+       ofd_object_put(env, fo);
 out:
+       if (rc == 0) {
+               /* we do not call this before to avoid lu_object_find() in
+                *  ->lvbo_update() holding another reference on the object.
+                * otherwise concurrent destroy can make the object unavailable
+                * for 2nd lu_object_find() waiting for the first reference
+                * to go... deadlock! */
+               res = ldlm_resource_get(ns, NULL, &info->fti_resid, LDLM_EXTENT, 0);
+               if (res != NULL) {
+                       ldlm_res_lvbo_update(res, NULL, 0);
+                       ldlm_resource_putref(res);
+               }
+       }
+
        return rc;
 }
 
-static int ofd_sync(const struct lu_env *env, struct obd_export *exp,
-                   struct obd_info *oinfo, obd_size start, obd_size end,
-                   struct ptlrpc_request_set *set)
+int ofd_destroy_by_fid(const struct lu_env *env, struct ofd_device *ofd,
+                      const struct lu_fid *fid, int orphan)
+{
+       struct ofd_thread_info  *info = ofd_info(env);
+       struct lustre_handle     lockh;
+       __u64                    flags = LDLM_FL_AST_DISCARD_DATA;
+       __u64                    rc = 0;
+       ldlm_policy_data_t       policy = {
+                                       .l_extent = { 0, OBD_OBJECT_EOF }
+                                };
+       struct ofd_object       *fo;
+
+       ENTRY;
+
+       fo = ofd_object_find_exists(env, ofd, fid);
+       if (IS_ERR(fo))
+               RETURN(PTR_ERR(fo));
+
+       /* Tell the clients that the object is gone now and that they should
+        * throw away any cached pages. */
+       ost_fid_build_resid(fid, &info->fti_resid);
+       rc = ldlm_cli_enqueue_local(ofd->ofd_namespace, &info->fti_resid,
+                                   LDLM_EXTENT, &policy, LCK_PW, &flags,
+                                   ldlm_blocking_ast, ldlm_completion_ast,
+                                   NULL, NULL, 0, LVB_T_NONE, NULL, &lockh);
+
+       /* We only care about the side-effects, just drop the lock. */
+       if (rc == ELDLM_OK)
+               ldlm_lock_decref(&lockh, LCK_PW);
+
+       LASSERT(fo != NULL);
+
+       rc = ofd_object_destroy(env, fo, orphan);
+       EXIT;
+
+       ofd_object_put(env, fo);
+       RETURN(rc);
+}
+
+/* needed by echo client only for now, RPC handler uses ofd_destroy_hdl() */
+int ofd_echo_destroy(const struct lu_env *env, struct obd_export *exp,
+                    struct obdo *oa, struct lov_stripe_md *md,
+                    struct obd_trans_info *oti, struct obd_export *md_exp,
+                    void *capa)
 {
        struct ofd_device       *ofd = ofd_exp(exp);
+       struct lu_fid           *fid = &oa->o_oi.oi_fid;
        int                      rc = 0;
 
        ENTRY;
 
-       /* if no objid is specified, it means "sync whole filesystem" */
-       if (oinfo->oi_oa == NULL || !(oinfo->oi_oa->o_valid & OBD_MD_FLID)) {
-               rc = dt_sync(env, ofd->ofd_osd);
+       ofd_info_init(env, exp);
+
+       CDEBUG(D_HA, "%s: Destroy object "DFID"\n", ofd_name(ofd), PFID(fid));
+
+       rc = ofd_destroy_by_fid(env, ofd, fid, 0);
+       if (rc == -ENOENT) {
+               CDEBUG(D_INODE, "%s: destroying non-existent object "DFID"\n",
+                      ofd_name(ofd), PFID(fid));
+               GOTO(out, rc);
+       } else if (rc != 0) {
+               CERROR("%s: error destroying object "DFID": %d\n",
+                      ofd_name(ofd), PFID(fid), rc);
                GOTO(out, rc);
        }
+       EXIT;
+out:
+       return rc;
+}
+
+/* needed by echo client only for now, RPC handler uses ofd_create_hdl()
+ * It is much simpler and just create objects */
+int ofd_echo_create(const struct lu_env *env, struct obd_export *exp,
+                   struct obdo *oa, struct lov_stripe_md **ea,
+                   struct obd_trans_info *oti)
+{
+       struct ofd_device       *ofd = ofd_exp(exp);
+       struct ofd_thread_info  *info;
+       obd_seq                  seq = ostid_seq(&oa->o_oi);
+       struct ofd_seq          *oseq;
+       int                      rc = 0, diff = 1;
+       obd_id                   next_id;
+       int                      count;
+
+       ENTRY;
+
+       info = ofd_info_init(env, exp);
+
+       LASSERT(seq == FID_SEQ_ECHO);
+       LASSERT(oa->o_valid & OBD_MD_FLGROUP);
+
+       CDEBUG(D_INFO, "ofd_create("DOSTID")\n", POSTID(&oa->o_oi));
+
+       down_read(&ofd->ofd_lastid_rwsem);
+       /* Currently, for safe, we do not distinguish which LAST_ID is broken,
+        * we may do that in the future.
+        * Return -ENOSPC until the LAST_ID rebuilt. */
+       if (unlikely(ofd->ofd_lastid_rebuilding))
+               GOTO(out_sem, rc = -ENOSPC);
+
+       oseq = ofd_seq_load(env, ofd, seq);
+       if (IS_ERR(oseq)) {
+               CERROR("%s: Can't find FID Sequence "LPX64": rc = %ld\n",
+                      ofd_name(ofd), seq, PTR_ERR(oseq));
+               GOTO(out_sem, rc = -EINVAL);
+       }
+
+       mutex_lock(&oseq->os_create_lock);
+       rc = ofd_grant_create(env, ofd_obd(ofd)->obd_self_export, &diff);
+       if (rc < 0) {
+               CDEBUG(D_HA, "%s: failed to acquire grant space for "
+                      "precreate (%d): rc = %d\n", ofd_name(ofd), diff, rc);
+               diff = 0;
+               GOTO(out, rc);
+       }
+
+       next_id = ofd_seq_last_oid(oseq) + 1;
+       count = ofd_precreate_batch(ofd, diff);
+
+       rc = ofd_precreate_objects(env, ofd, next_id, oseq, count, 0);
+       if (rc < 0) {
+               CERROR("%s: unable to precreate: rc = %d\n",
+                      ofd_name(ofd), rc);
+       } else {
+               ostid_set_id(&oa->o_oi, ofd_seq_last_oid(oseq));
+               oa->o_valid |= OBD_MD_FLID | OBD_MD_FLGROUP;
+               rc = 0;
+       }
+
+       ofd_grant_commit(env, ofd_obd(ofd)->obd_self_export, rc);
+out:
+       mutex_unlock(&oseq->os_create_lock);
+       if (rc == 0 && ea != NULL) {
+               struct lov_stripe_md *lsm = *ea;
+
+               lsm->lsm_oi = oa->o_oi;
+       }
+       ofd_seq_put(env, oseq);
+
+out_sem:
+       up_read(&ofd->ofd_lastid_rwsem);
+       RETURN(rc);
+}
+
+/* needed by echo client only for now, RPC handler uses ofd_getattr_hdl() */
+int ofd_echo_getattr(const struct lu_env *env, struct obd_export *exp,
+                    struct obd_info *oinfo)
+{
+       struct ofd_device       *ofd = ofd_exp(exp);
+       struct ofd_thread_info  *info;
+       struct lu_fid           *fid = &oinfo->oi_oa->o_oi.oi_fid;
+       struct ofd_object       *fo;
+       int                      rc = 0;
+
+       ENTRY;
+
+       info = ofd_info_init(env, exp);
+
+       fo = ofd_object_find_exists(env, ofd, fid);
+       if (IS_ERR(fo))
+               GOTO(out, rc = PTR_ERR(fo));
+
+       LASSERT(fo != NULL);
+       rc = ofd_attr_get(env, fo, &info->fti_attr);
+       oinfo->oi_oa->o_valid = OBD_MD_FLID;
+       if (rc == 0) {
+               __u64 curr_version;
+
+               obdo_from_la(oinfo->oi_oa, &info->fti_attr,
+                            OFD_VALID_FLAGS | LA_UID | LA_GID);
+
+               /* Store object version in reply */
+               curr_version = dt_version_get(env, ofd_object_child(fo));
+               if ((__s64)curr_version != -EOPNOTSUPP) {
+                       oinfo->oi_oa->o_valid |= OBD_MD_FLDATAVERSION;
+                       oinfo->oi_oa->o_data_version = curr_version;
+               }
+       }
+
+       ofd_object_put(env, fo);
+out:
+       RETURN(rc);
+}
+
+static int ofd_ioc_get_obj_version(const struct lu_env *env,
+                                  struct ofd_device *ofd, void *karg)
+{
+       struct obd_ioctl_data *data = karg;
+       struct lu_fid          fid;
+       struct ofd_object     *fo;
+       dt_obj_version_t       version;
+       int                    rc = 0;
+
+       ENTRY;
+
+       if (data->ioc_inlbuf2 == NULL || data->ioc_inllen2 != sizeof(version))
+               GOTO(out, rc = -EINVAL);
+
+       if (data->ioc_inlbuf1 != NULL && data->ioc_inllen1 == sizeof(fid)) {
+               fid = *(struct lu_fid *)data->ioc_inlbuf1;
+       } else if (data->ioc_inlbuf3 != NULL &&
+                  data->ioc_inllen3 == sizeof(__u64) &&
+                  data->ioc_inlbuf4 != NULL &&
+                  data->ioc_inllen4 == sizeof(__u64)) {
+               struct ost_id ostid;
+
+               ostid_set_seq(&ostid, *(__u64 *)data->ioc_inlbuf4);
+               ostid_set_id(&ostid, *(__u64 *)data->ioc_inlbuf3);
+               rc = ostid_to_fid(&fid, &ostid,
+                                 ofd->ofd_lut.lut_lsd.lsd_osd_index);
+               if (rc != 0)
+                       GOTO(out, rc);
+       } else {
+               GOTO(out, rc = -EINVAL);
+       }
+
+       if (!fid_is_sane(&fid))
+               GOTO(out, rc = -EINVAL);
+
+       fo = ofd_object_find(env, ofd, &fid);
+       if (IS_ERR(fo))
+               GOTO(out, rc = PTR_ERR(fo));
+
+       if (!ofd_object_exists(fo))
+               GOTO(out_fo, rc = -ENOENT);
+
+       if (lu_object_remote(&fo->ofo_obj.do_lu))
+               GOTO(out_fo, rc = -EREMOTE);
+
+       version = dt_version_get(env, ofd_object_child(fo));
+       if (version == 0)
+               GOTO(out_fo, rc = -EIO);
+
+       *(dt_obj_version_t *)data->ioc_inlbuf2 = version;
 
        EXIT;
+out_fo:
+       ofd_object_put(env, fo);
 out:
        return rc;
 }
@@ -486,13 +1007,13 @@ int ofd_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
        ENTRY;
 
        CDEBUG(D_IOCTL, "handling ioctl cmd %#x\n", cmd);
-       rc = lu_env_init(&env, LCT_LOCAL);
+       rc = lu_env_init(&env, LCT_DT_THREAD);
        if (rc)
                RETURN(rc);
 
        switch (cmd) {
        case OBD_IOC_ABORT_RECOVERY:
-               CERROR("aborting recovery for device %s\n", obd->obd_name);
+               CERROR("%s: aborting recovery\n", obd->obd_name);
                target_stop_recovery_thread(obd);
                break;
        case OBD_IOC_SYNC:
@@ -504,9 +1025,40 @@ int ofd_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
                if (rc == 0)
                        rc = dt_ro(&env, ofd->ofd_osd);
                break;
+       case OBD_IOC_START_LFSCK: {
+               struct obd_ioctl_data *data = karg;
+               struct lfsck_start_param lsp;
+
+               if (unlikely(data == NULL)) {
+                       rc = -EINVAL;
+                       break;
+               }
+
+               lsp.lsp_start = (struct lfsck_start *)(data->ioc_inlbuf1);
+               lsp.lsp_index_valid = 0;
+               rc = lfsck_start(&env, ofd->ofd_osd, &lsp);
+               break;
+       }
+       case OBD_IOC_STOP_LFSCK: {
+               struct obd_ioctl_data *data = karg;
+               struct lfsck_stop      stop;
+
+               stop.ls_status = LS_STOPPED;
+               /* Old lfsck utils may pass NULL @stop. */
+               if (data->ioc_inlbuf1 == NULL)
+                       stop.ls_flags = 0;
+               else
+                       stop.ls_flags =
+                       ((struct lfsck_stop *)(data->ioc_inlbuf1))->ls_flags;
+
+               rc = lfsck_stop(&env, ofd->ofd_osd, &stop);
+               break;
+       }
+       case OBD_IOC_GET_OBJ_VERSION:
+               rc = ofd_ioc_get_obj_version(&env, ofd, karg);
+               break;
        default:
-               CERROR("Not supported cmd = %d for device %s\n",
-                      cmd, obd->obd_name);
+               CERROR("%s: not supported cmd = %d\n", obd->obd_name, cmd);
                rc = -ENOTTY;
        }
 
@@ -532,20 +1084,27 @@ static int ofd_precleanup(struct obd_device *obd, enum obd_cleanup_stage stage)
 
 static int ofd_ping(const struct lu_env *env, struct obd_export *exp)
 {
+       ofd_fmd_expire(exp);
        return 0;
 }
 
-static int ofd_health_check(const struct lu_env *env, struct obd_device *obd)
+static int ofd_health_check(const struct lu_env *nul, struct obd_device *obd)
 {
        struct ofd_device       *ofd = ofd_dev(obd->obd_lu_dev);
        struct ofd_thread_info  *info;
+       struct lu_env            env;
 #ifdef USE_HEALTH_CHECK_WRITE
        struct thandle          *th;
 #endif
        int                      rc = 0;
 
-       info = ofd_info_init(env, NULL);
-       rc = dt_statfs(env, ofd->ofd_osd, &info->fti_u.osfs);
+       /* obd_proc_read_health pass NULL env, we need real one */
+       rc = lu_env_init(&env, LCT_DT_THREAD);
+       if (rc)
+               RETURN(rc);
+
+       info = ofd_info_init(&env, NULL);
+       rc = dt_statfs(&env, ofd->ofd_osd, &info->fti_u.osfs);
        if (unlikely(rc))
                GOTO(out, rc);
 
@@ -553,52 +1112,66 @@ static int ofd_health_check(const struct lu_env *env, struct obd_device *obd)
                GOTO(out, rc = -EROFS);
 
 #ifdef USE_HEALTH_CHECK_WRITE
-       OBD_ALLOC(info->fti_buf.lb_buf, CFS_PAGE_SIZE);
+       OBD_ALLOC(info->fti_buf.lb_buf, PAGE_CACHE_SIZE);
        if (info->fti_buf.lb_buf == NULL)
                GOTO(out, rc = -ENOMEM);
 
-       info->fti_buf.lb_len = CFS_PAGE_SIZE;
+       info->fti_buf.lb_len = PAGE_CACHE_SIZE;
        info->fti_off = 0;
 
-       th = dt_trans_create(env, ofd->ofd_osd);
+       th = dt_trans_create(&env, ofd->ofd_osd);
        if (IS_ERR(th))
                GOTO(out, rc = PTR_ERR(th));
 
-       rc = dt_declare_record_write(env, ofd->ofd_health_check_file,
-                                    info->fti_buf.lb_len, info->fti_off, th);
+       rc = dt_declare_record_write(&env, ofd->ofd_health_check_file,
+                                    &info->fti_buf, info->fti_off, th);
        if (rc == 0) {
                th->th_sync = 1; /* sync IO is needed */
-               rc = dt_trans_start_local(env, ofd->ofd_osd, th);
+               rc = dt_trans_start_local(&env, ofd->ofd_osd, th);
                if (rc == 0)
-                       rc = dt_record_write(env, ofd->ofd_health_check_file,
+                       rc = dt_record_write(&env, ofd->ofd_health_check_file,
                                             &info->fti_buf, &info->fti_off,
                                             th);
        }
-       dt_trans_stop(env, ofd->ofd_osd, th);
+       dt_trans_stop(&env, ofd->ofd_osd, th);
 
-       OBD_FREE(info->fti_buf.lb_buf, CFS_PAGE_SIZE);
+       OBD_FREE(info->fti_buf.lb_buf, PAGE_CACHE_SIZE);
 
        CDEBUG(D_INFO, "write 1 page synchronously for checking io rc %d\n",rc);
 #endif
 out:
+       lu_env_fini(&env);
        return !!rc;
 }
 
-static int ofd_obd_notify(struct obd_device *obd, struct obd_device *unused,
-                         enum obd_notify_event ev, void *data)
+/*
+ * Handle quota control requests to consult current usage/limit.
+ *
+ * \param obd - is the obd device associated with the ofd
+ * \param exp - is the client's export
+ * \param oqctl - is the obd_quotactl request to be processed
+ */
+static int ofd_quotactl(struct obd_device *obd, struct obd_export *exp,
+                       struct obd_quotactl *oqctl)
 {
-       switch (ev) {
-       case OBD_NOTIFY_CONFIG:
-               LASSERT(obd->obd_no_conn);
-               cfs_spin_lock(&obd->obd_dev_lock);
-               obd->obd_no_conn = 0;
-               cfs_spin_unlock(&obd->obd_dev_lock);
-               break;
-       default:
-               CDEBUG(D_INFO, "%s: Unhandled notification %#x\n",
-                      obd->obd_name, ev);
-       }
-       return 0;
+       struct ofd_device  *ofd = ofd_dev(obd->obd_lu_dev);
+       struct lu_env       env;
+       int                 rc;
+       ENTRY;
+
+       /* report success for quota on/off for interoperability with current MDT
+        * stack */
+       if (oqctl->qc_cmd == Q_QUOTAON || oqctl->qc_cmd == Q_QUOTAOFF)
+               RETURN(0);
+
+       rc = lu_env_init(&env, LCT_DT_THREAD);
+       if (rc)
+               RETURN(rc);
+
+       rc = lquotactl_slv(&env, ofd->ofd_osd, oqctl);
+       lu_env_fini(&env);
+
+       RETURN(rc);
 }
 
 struct obd_ops ofd_obd_ops = {
@@ -606,16 +1179,21 @@ struct obd_ops ofd_obd_ops = {
        .o_connect              = ofd_obd_connect,
        .o_reconnect            = ofd_obd_reconnect,
        .o_disconnect           = ofd_obd_disconnect,
-       .o_set_info_async       = ofd_set_info_async,
-       .o_get_info             = ofd_get_info,
+       .o_create               = ofd_echo_create,
        .o_statfs               = ofd_statfs,
+       .o_setattr              = ofd_echo_setattr,
+       .o_preprw               = ofd_preprw,
+       .o_commitrw             = ofd_commitrw,
+       .o_destroy              = ofd_echo_destroy,
        .o_init_export          = ofd_init_export,
        .o_destroy_export       = ofd_destroy_export,
        .o_postrecov            = ofd_obd_postrecov,
-       .o_sync                 = ofd_sync,
+       .o_getattr              = ofd_echo_getattr,
        .o_iocontrol            = ofd_iocontrol,
        .o_precleanup           = ofd_precleanup,
        .o_ping                 = ofd_ping,
        .o_health_check         = ofd_health_check,
-       .o_notify               = ofd_obd_notify,
+       .o_quotactl             = ofd_quotactl,
+       .o_set_info_async       = ofd_set_info_async,
+       .o_get_info             = ofd_get_info,
 };