LU-6047 mdt: remove Size on MDS support

[fs/lustre-release.git] / lustre / mdt / mdt_recovery.c

diff --git a/lustre/mdt/mdt_recovery.c b/lustre/mdt/mdt_recovery.c
index f5a49da..f9260a3 100644 (file)
--- a/lustre/mdt/mdt_recovery.c
+++ b/lustre/mdt/mdt_recovery.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2013, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -71,12 +71,6 @@ const struct lu_buf *mdt_buf_const(const struct lu_env *env,
         return buf;
 }
 
-void mdt_trans_stop(const struct lu_env *env,
-                    struct mdt_device *mdt, struct thandle *th)
-{
-        dt_trans_stop(env, mdt->mdt_bottom, th);
-}
-
 /*
  * last_rcvd & last_committed update callbacks
  */
@@ -116,7 +110,7 @@ int mdt_fs_setup(const struct lu_env *env, struct mdt_device *mdt,
        mdt->mdt_txn_cb.dtc_txn_commit = NULL;
        mdt->mdt_txn_cb.dtc_cookie = NULL;
        mdt->mdt_txn_cb.dtc_tag = LCT_MD_THREAD;
-       CFS_INIT_LIST_HEAD(&mdt->mdt_txn_cb.dtc_linkage);
+       INIT_LIST_HEAD(&mdt->mdt_txn_cb.dtc_linkage);
 
        dt_txn_callback_add(mdt->mdt_bottom, &mdt->mdt_txn_cb);
 
@@ -139,16 +133,16 @@ void mdt_fs_cleanup(const struct lu_env *env, struct mdt_device *mdt)
 static void mdt_steal_ack_locks(struct ptlrpc_request *req)
 {
        struct ptlrpc_service_part *svcpt;
-        struct obd_export         *exp = req->rq_export;
-        cfs_list_t                *tmp;
-        struct ptlrpc_reply_state *oldrep;
-        int                        i;
+       struct obd_export          *exp = req->rq_export;
+       struct list_head           *tmp;
+       struct ptlrpc_reply_state  *oldrep;
+       int                         i;
 
-        /* CAVEAT EMPTOR: spinlock order */
+       /* CAVEAT EMPTOR: spinlock order */
        spin_lock(&exp->exp_lock);
-        cfs_list_for_each (tmp, &exp->exp_outstanding_replies) {
-                oldrep = cfs_list_entry(tmp, struct ptlrpc_reply_state,
-                                        rs_exp_list);
+       list_for_each(tmp, &exp->exp_outstanding_replies) {
+               oldrep = list_entry(tmp, struct ptlrpc_reply_state,
+                                   rs_exp_list);
 
                 if (oldrep->rs_xid != req->rq_xid)
                         continue;
@@ -162,7 +156,7 @@ static void mdt_steal_ack_locks(struct ptlrpc_request *req)
                svcpt = oldrep->rs_svcpt;
                spin_lock(&svcpt->scp_rep_lock);
 
-                cfs_list_del_init (&oldrep->rs_exp_list);
+               list_del_init(&oldrep->rs_exp_list);
 
                CDEBUG(D_HA, "Stealing %d locks from rs %p x"LPD64".t"LPD64
                       " o%d NID %s\n",
@@ -189,8 +183,8 @@ static void mdt_steal_ack_locks(struct ptlrpc_request *req)
 /**
  * VBR: restore versions
  */
-void mdt_vbr_reconstruct(struct ptlrpc_request *req,
-                         struct lsd_client_data *lcd)
+static void mdt_vbr_reconstruct(struct ptlrpc_request *req,
+                               struct lsd_client_data *lcd)
 {
         __u64 pre_versions[4] = {0};
         pre_versions[0] = lcd->lcd_pre_versions[0];
@@ -200,14 +194,12 @@ void mdt_vbr_reconstruct(struct ptlrpc_request *req,
         lustre_msg_set_versions(req->rq_repmsg, pre_versions);
 }
 
-void mdt_req_from_lcd(struct ptlrpc_request *req,
-                      struct lsd_client_data *lcd)
+void mdt_req_from_lcd(struct ptlrpc_request *req, struct lsd_client_data *lcd)
 {
         DEBUG_REQ(D_HA, req, "restoring transno "LPD64"/status %d",
                   lcd->lcd_last_transno, lcd->lcd_last_result);
 
-        if (lustre_msg_get_opc(req->rq_reqmsg) == MDS_CLOSE ||
-            lustre_msg_get_opc(req->rq_repmsg) == MDS_DONE_WRITING) {
+       if (lustre_msg_get_opc(req->rq_reqmsg) == MDS_CLOSE) {
                 req->rq_transno = lcd->lcd_last_close_transno;
                 req->rq_status = lcd->lcd_last_close_result;
         } else {
@@ -338,21 +330,6 @@ static void mdt_reconstruct_setattr(struct mdt_thread_info *mti,
                mdt_fake_ma(&mti->mti_attr);
         mdt_pack_attr2body(mti, body, &mti->mti_attr.ma_attr,
                            mdt_object_fid(obj));
-        if (mti->mti_ioepoch && (mti->mti_ioepoch->flags & MF_EPOCH_OPEN)) {
-                struct mdt_file_data *mfd;
-                struct mdt_body *repbody;
-
-                repbody = req_capsule_server_get(mti->mti_pill, &RMF_MDT_BODY);
-               repbody->mbo_ioepoch = obj->mot_ioepoch;
-               spin_lock(&med->med_open_lock);
-               cfs_list_for_each_entry(mfd, &med->med_open_head, mfd_list) {
-                       if (mfd->mfd_xid == req->rq_xid)
-                               break;
-               }
-               LASSERT(&mfd->mfd_list != &med->med_open_head);
-               spin_unlock(&med->med_open_lock);
-               repbody->mbo_handle.cookie = mfd->mfd_handle.h_cookie;
-       }
 
        mdt_object_put(mti->mti_env, obj);
 }