Whamcloud - gitweb
LU-3042 build: fix 'NULL pointer dereference' errors
[fs/lustre-release.git] / lustre / mdt / mdt_hsm.c
index 9bc870e..510c737 100644 (file)
@@ -20,7 +20,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  * Use is subject to license terms.
  * Copyright (c) 2011, 2012 Commissariat a l'energie atomique et aux energies
  *                          alternatives
@@ -34,9 +34,6 @@
  * Author: JC Lafoucriere <jacques-charles.lafoucriere@cea.fr>
  */
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
 #define DEBUG_SUBSYSTEM S_MDS
 
 #include "mdt_internal.h"
 
 #define MDT_HSM_FREE(ptr, size) OBD_FREE_LARGE((ptr), (size))
 
-/*
- * fake functions, will be replace by real one with HSM Coordinator patch
- */
-
-int mdt_hsm_copytool_send(struct obd_export *exp)
-{
-       return 0;
-}
-
-static int mdt_hsm_coordinator_update(struct mdt_thread_info *info,
-                                     struct hsm_progress_kernel *pgs)
-{
-       return 0;
-}
-
-static int mdt_hsm_agent_register_mask(struct mdt_thread_info *info,
-                                      struct obd_uuid *uuid,
-                                      __u32 archive_mask)
-{
-       return 0;
-}
-
-static int mdt_hsm_agent_unregister(struct mdt_thread_info *info,
-                                   struct obd_uuid *uuid)
-{
-       return 0;
-}
-
-static int mdt_hsm_coordinator_get_actions(struct mdt_thread_info *mti,
-                                          struct hsm_action_list *hal)
-{
-       return 0;
-}
-
-static int mdt_hsm_coordinator_actions(struct mdt_thread_info *info,
-                                      struct hsm_action_list *hal,
-                                      __u64 *compound_id,
-                                      int mti_attr_is_valid)
-{
-       return 0;
-}
-
 /**
  * Update on-disk HSM attributes.
  */
 int mdt_hsm_attr_set(struct mdt_thread_info *info, struct mdt_object *obj,
-                    struct md_hsm *mh)
+                    const struct md_hsm *mh)
 {
        struct md_object        *next = mdt_object_child(obj);
        struct lu_buf           *buf = &info->mti_buf;
@@ -132,14 +87,21 @@ int mdt_hsm_attr_set(struct mdt_thread_info *info, struct mdt_object *obj,
  */
 int mdt_hsm_progress(struct mdt_thread_info *info)
 {
+       struct mdt_body                 *body;
        struct hsm_progress_kernel      *hpk;
        int                              rc;
        ENTRY;
 
+       body = req_capsule_client_get(info->mti_pill, &RMF_MDT_BODY);
+       if (body == NULL)
+               RETURN(-EPROTO);
+
        hpk = req_capsule_client_get(info->mti_pill, &RMF_MDS_HSM_PROGRESS);
        if (hpk == NULL)
                RETURN(-EPROTO);
 
+       hpk->hpk_errval = lustre_errno_ntoh(hpk->hpk_errval);
+
        CDEBUG(D_HSM, "Progress on "DFID": len="LPU64" err=%d\n",
               PFID(&hpk->hpk_fid), hpk->hpk_extent.length, hpk->hpk_errval);
 
@@ -159,11 +121,16 @@ int mdt_hsm_progress(struct mdt_thread_info *info)
 
 int mdt_hsm_ct_register(struct mdt_thread_info *info)
 {
-       struct ptlrpc_request *req = mdt_info_req(info);
-       __u32 *archives;
-       int rc;
+       struct mdt_body         *body;
+       struct ptlrpc_request   *req = mdt_info_req(info);
+       __u32                   *archives;
+       int                      rc;
        ENTRY;
 
+       body = req_capsule_client_get(info->mti_pill, &RMF_MDT_BODY);
+       if (body == NULL)
+               RETURN(-EPROTO);
+
        archives = req_capsule_client_get(info->mti_pill, &RMF_MDS_HSM_ARCHIVE);
        if (archives == NULL)
                RETURN(-EPROTO);
@@ -177,10 +144,15 @@ int mdt_hsm_ct_register(struct mdt_thread_info *info)
 
 int mdt_hsm_ct_unregister(struct mdt_thread_info *info)
 {
-       struct ptlrpc_request *req = mdt_info_req(info);
-       int rc;
+       struct mdt_body         *body;
+       struct ptlrpc_request   *req = mdt_info_req(info);
+       int                      rc;
        ENTRY;
 
+       body = req_capsule_client_get(info->mti_pill, &RMF_MDT_BODY);
+       if (body == NULL)
+               RETURN(-EPROTO);
+
        /* XXX: directly include this function here? */
        rc = mdt_hsm_agent_unregister(info, &req->rq_export->exp_client_uuid);
 
@@ -312,10 +284,10 @@ int mdt_hsm_state_set(struct mdt_thread_info *info)
         * LOST without ARCHIVED: cannot lost a non-archived file.
         */
        flags = ma->ma_hsm.mh_flags;
-       if (((flags & HS_DIRTY) && !(flags & HS_EXISTS)) ||
-           ((flags & HS_RELEASED) && (flags & HS_DIRTY)) ||
-           ((flags & HS_RELEASED) && !(flags & HS_ARCHIVED)) ||
-           ((flags & HS_LOST)     && !(flags & HS_ARCHIVED))) {
+       if ((flags & HS_DIRTY    && !(flags & HS_EXISTS)) ||
+           (flags & HS_RELEASED && flags & HS_DIRTY) ||
+           (flags & HS_RELEASED && !(flags & HS_ARCHIVED)) ||
+           (flags & HS_LOST     && !(flags & HS_ARCHIVED))) {
                CDEBUG(D_HSM, "Incompatible flag change on "DFID
                              "flags="LPX64"\n",
                       PFID(&info->mti_body->fid1), flags);
@@ -378,17 +350,17 @@ int mdt_hsm_action(struct mdt_thread_info *info)
        hal->hal_version = HAL_VERSION;
        hal->hal_archive_id = 0;
        hal->hal_flags = 0;
-       obd_uuid2fsname(hal->hal_fsname, mdt2obd_dev(info->mti_mdt)->obd_name,
+       obd_uuid2fsname(hal->hal_fsname, mdt_obd_name(info->mti_mdt),
                        MTI_NAME_MAXLEN);
        hal->hal_count = 1;
-       hai = hai_zero(hal);
+       hai = hai_first(hal);
        hai->hai_action = HSMA_NONE;
        hai->hai_cookie = 0;
        hai->hai_gid = 0;
        hai->hai_fid = info->mti_body->fid1;
        hai->hai_len = sizeof(*hai);
 
-       rc = mdt_hsm_coordinator_get_actions(info, hal);
+       rc = mdt_hsm_get_actions(info, hal);
        if (rc)
                GOTO(out_free, rc);
 
@@ -417,7 +389,7 @@ int mdt_hsm_action(struct mdt_thread_info *info)
        default:
                hca->hca_action = HUA_NONE;
                CERROR("%s: Unknown hsm action: %d on "DFID"\n",
-                      mdt2obd_dev(info->mti_mdt)->obd_name,
+                      mdt_obd_name(info->mti_mdt),
                       hai->hai_action, PFID(&hai->hai_fid));
                break;
        }
@@ -517,12 +489,12 @@ int mdt_hsm_request(struct mdt_thread_info *info)
        hal->hal_version = HAL_VERSION;
        hal->hal_archive_id = hr->hr_archive_id;
        hal->hal_flags = hr->hr_flags;
-       obd_uuid2fsname(hal->hal_fsname, mdt2obd_dev(info->mti_mdt)->obd_name,
+       obd_uuid2fsname(hal->hal_fsname, mdt_obd_name(info->mti_mdt),
                        MTI_NAME_MAXLEN);
 
        hal->hal_count = hr->hr_itemcount;
-       hai = hai_zero(hal);
-       for (i = 0; i < hr->hr_itemcount; i++) {
+       hai = hai_first(hal);
+       for (i = 0; i < hr->hr_itemcount; i++, hai = hai_next(hai)) {
                hai->hai_action = action;
                hai->hai_cookie = 0;
                hai->hai_gid = 0;
@@ -530,16 +502,14 @@ int mdt_hsm_request(struct mdt_thread_info *info)
                hai->hai_extent = hui[i].hui_extent;
                memcpy(hai->hai_data, data, hr->hr_data_len);
                hai->hai_len = sizeof(*hai) + hr->hr_data_len;
-               hai = hai_next(hai);
        }
 
-       rc = mdt_hsm_coordinator_actions(info, hal, &compound_id, 0);
-       /* ENODATA error code is needed only for implicit requests */
-       if (rc == -ENODATA)
-               rc = 0;
+       rc = mdt_hsm_add_actions(info, hal, &compound_id);
 
        MDT_HSM_FREE(hal, hal_size);
-       EXIT;
+
+       GOTO(out_ucred, rc);
+
 out_ucred:
        mdt_exit_ucred(info);
        return rc;