LU-3817 llite: Truncate to restore file

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

diff --git a/lustre/mdt/mdt_hsm.c b/lustre/mdt/mdt_hsm.c
index dc1520c..510c737 100644 (file)
--- a/lustre/mdt/mdt_hsm.c
+++ b/lustre/mdt/mdt_hsm.c
@@ -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"
@@ -54,53 +51,11 @@
 
 #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;
@@ -329,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);
@@ -398,14 +353,14 @@ int mdt_hsm_action(struct mdt_thread_info *info)
        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);
 
@@ -538,8 +493,8 @@ int mdt_hsm_request(struct mdt_thread_info *info)
                        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;
@@ -547,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;