X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_hsm.c;h=75c2024e0aee33cdcb30066fb843ec80f7f3b1d4;hb=8db990334e243f98d253c55a46675c2d633dc9cc;hp=c9a0cf72ff66ae4b127e4e391aba572789f84603;hpb=98060d83459ba10409f295898f0ec917f938b4d3;p=fs%2Flustre-release.git

diff --git a/lustre/mdt/mdt_hsm.c b/lustre/mdt/mdt_hsm.c
index c9a0cf7..75c2024 100644
--- 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;
@@ -122,6 +77,25 @@ int mdt_hsm_attr_set(struct mdt_thread_info *info, struct mdt_object *obj,
 	RETURN(rc);
 }
 
+static inline bool mdt_hsm_is_admin(struct mdt_thread_info *info)
+{
+	bool is_admin;
+	int rc;
+
+	if (info->mti_body == NULL)
+		return false;
+
+	rc = mdt_init_ucred(info, (struct mdt_body *)info->mti_body);
+	if (rc < 0)
+		return false;
+
+	is_admin = md_capable(mdt_ucred(info), CFS_CAP_SYS_ADMIN);
+
+	mdt_exit_ucred(info);
+
+	return is_admin;
+}
+
 /**
  * Extract information coming from a copytool and asks coordinator to update
  * a request status depending on the update content.
@@ -130,20 +104,21 @@ int mdt_hsm_attr_set(struct mdt_thread_info *info, struct mdt_object *obj,
  *
  * This is HSM_PROGRESS RPC handler.
  */
-int mdt_hsm_progress(struct mdt_thread_info *info)
+int mdt_hsm_progress(struct tgt_session_info *tsi)
 {
-	struct mdt_body			*body;
+	struct mdt_thread_info		*info;
 	struct hsm_progress_kernel	*hpk;
 	int				 rc;
 	ENTRY;
 
-	body = req_capsule_client_get(info->mti_pill, &RMF_MDT_BODY);
-	if (body == NULL)
+	if (tsi->tsi_mdt_body == NULL)
 		RETURN(-EPROTO);
 
-	hpk = req_capsule_client_get(info->mti_pill, &RMF_MDS_HSM_PROGRESS);
+	hpk = req_capsule_client_get(tsi->tsi_pill, &RMF_MDS_HSM_PROGRESS);
 	if (hpk == NULL)
-		RETURN(-EPROTO);
+		RETURN(err_serious(-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);
@@ -157,48 +132,56 @@ int mdt_hsm_progress(struct mdt_thread_info *info)
 		CDEBUG(D_HSM, "Finished "DFID" (%d) cancel cookie="LPX64"\n",
 		       PFID(&hpk->hpk_fid), hpk->hpk_errval, hpk->hpk_cookie);
 
-	rc = mdt_hsm_coordinator_update(info, hpk);
+	info = tsi2mdt_info(tsi);
+	if (!mdt_hsm_is_admin(info))
+		GOTO(out, rc = -EPERM);
 
+	rc = mdt_hsm_coordinator_update(info, hpk);
+out:
+	mdt_thread_info_fini(info);
 	RETURN(rc);
 }
 
-int mdt_hsm_ct_register(struct mdt_thread_info *info)
+int mdt_hsm_ct_register(struct tgt_session_info *tsi)
 {
-	struct mdt_body		*body;
-	struct ptlrpc_request	*req = mdt_info_req(info);
+	struct mdt_thread_info	*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);
+	archives = req_capsule_client_get(tsi->tsi_pill, &RMF_MDS_HSM_ARCHIVE);
 	if (archives == NULL)
-		RETURN(-EPROTO);
+		RETURN(err_serious(-EPROTO));
+
+	info = tsi2mdt_info(tsi);
+	if (!mdt_hsm_is_admin(info))
+		GOTO(out, rc = -EPERM);
 
 	/* XXX: directly include this function here? */
-	rc = mdt_hsm_agent_register_mask(info, &req->rq_export->exp_client_uuid,
+	rc = mdt_hsm_agent_register_mask(info, &tsi->tsi_exp->exp_client_uuid,
 					 *archives);
-
+out:
+	mdt_thread_info_fini(info);
 	RETURN(rc);
 }
 
-int mdt_hsm_ct_unregister(struct mdt_thread_info *info)
+int mdt_hsm_ct_unregister(struct tgt_session_info *tsi)
 {
-	struct mdt_body		*body;
-	struct ptlrpc_request	*req = mdt_info_req(info);
+	struct mdt_thread_info	*info;
 	int			 rc;
 	ENTRY;
 
-	body = req_capsule_client_get(info->mti_pill, &RMF_MDT_BODY);
-	if (body == NULL)
+	if (tsi->tsi_mdt_body == NULL)
 		RETURN(-EPROTO);
 
-	/* XXX: directly include this function here? */
-	rc = mdt_hsm_agent_unregister(info, &req->rq_export->exp_client_uuid);
+	info = tsi2mdt_info(tsi);
+	if (!mdt_hsm_is_admin(info))
+		GOTO(out, rc = -EPERM);
 
+	/* XXX: directly include this function here? */
+	rc = mdt_hsm_agent_unregister(info, &tsi->tsi_exp->exp_client_uuid);
+out:
+	mdt_thread_info_fini(info);
 	RETURN(rc);
 }
 
@@ -210,8 +193,9 @@ int mdt_hsm_ct_unregister(struct mdt_thread_info *info)
  *
  * This is MDS_HSM_STATE_GET RPC handler.
  */
-int mdt_hsm_state_get(struct mdt_thread_info *info)
+int mdt_hsm_state_get(struct tgt_session_info *tsi)
 {
+	struct mdt_thread_info	*info = tsi2mdt_info(tsi);
 	struct mdt_object	*obj = info->mti_object;
 	struct md_attr		*ma  = &info->mti_attr;
 	struct hsm_user_state	*hus;
@@ -219,41 +203,47 @@ int mdt_hsm_state_get(struct mdt_thread_info *info)
 	int			 rc;
 	ENTRY;
 
+	if (info->mti_body == NULL || obj == NULL)
+		GOTO(out, rc = -EPROTO);
+
+	/* Only valid if client is remote */
+	rc = mdt_init_ucred(info, (struct mdt_body *)info->mti_body);
+	if (rc < 0)
+		GOTO(out, rc = err_serious(rc));
+
 	lh = &info->mti_lh[MDT_LH_CHILD];
 	mdt_lock_reg_init(lh, LCK_PR);
 	rc = mdt_object_lock(info, obj, lh, MDS_INODELOCK_LOOKUP,
 			     MDT_LOCAL_LOCK);
-	if (rc)
-		RETURN(rc);
-
-	/* Only valid if client is remote */
-	rc = mdt_init_ucred(info, (struct mdt_body *)info->mti_body);
-	if (rc)
-		GOTO(out_unlock, rc = err_serious(rc));
+	if (rc < 0)
+		GOTO(out_ucred, rc);
 
 	ma->ma_valid = 0;
 	ma->ma_need = MA_HSM;
 	rc = mdt_attr_get_complex(info, obj, ma);
 	if (rc)
-		GOTO(out_ucred, rc);
+		GOTO(out_unlock, rc);
 
 	if (req_capsule_get_size(info->mti_pill, &RMF_CAPA1, RCL_CLIENT))
 		mdt_set_capainfo(info, 0, &info->mti_body->fid1,
-			    req_capsule_client_get(info->mti_pill, &RMF_CAPA1));
+				 req_capsule_client_get(info->mti_pill,
+				 &RMF_CAPA1));
 
-	hus = req_capsule_server_get(info->mti_pill, &RMF_HSM_USER_STATE);
+	hus = req_capsule_server_get(tsi->tsi_pill, &RMF_HSM_USER_STATE);
 	if (hus == NULL)
-		GOTO(out_ucred, rc = -EPROTO);
+		GOTO(out_unlock, rc = -EPROTO);
 
 	/* Current HSM flags */
 	hus->hus_states = ma->ma_hsm.mh_flags;
 	hus->hus_archive_id = ma->ma_hsm.mh_arch_id;
 
 	EXIT;
-out_ucred:
-	mdt_exit_ucred(info);
 out_unlock:
 	mdt_object_unlock(info, obj, lh, 1);
+out_ucred:
+	mdt_exit_ucred(info);
+out:
+	mdt_thread_info_fini(info);
 	return rc;
 }
 
@@ -266,8 +256,9 @@ out_unlock:
  *
  * This is MDS_HSM_STATE_SET RPC handler.
  */
-int mdt_hsm_state_set(struct mdt_thread_info *info)
+int mdt_hsm_state_set(struct tgt_session_info *tsi)
 {
+	struct mdt_thread_info	*info = tsi2mdt_info(tsi);
 	struct mdt_object	*obj = info->mti_object;
 	struct md_attr          *ma = &info->mti_attr;
 	struct hsm_state_set	*hss;
@@ -276,33 +267,40 @@ int mdt_hsm_state_set(struct mdt_thread_info *info)
 	__u64			 flags;
 	ENTRY;
 
-	lh = &info->mti_lh[MDT_LH_CHILD];
-	mdt_lock_reg_init(lh, LCK_PW);
-	rc = mdt_object_lock(info, obj, lh, MDS_INODELOCK_LOOKUP,
-			     MDT_LOCAL_LOCK);
-	if (rc)
-		RETURN(rc);
+	hss = req_capsule_client_get(info->mti_pill, &RMF_HSM_STATE_SET);
+
+	if (info->mti_body == NULL || obj == NULL || hss == NULL)
+		GOTO(out, rc = -EPROTO);
 
 	/* Only valid if client is remote */
 	rc = mdt_init_ucred(info, (struct mdt_body *)info->mti_body);
-	if (rc)
-		GOTO(out_obj, rc = err_serious(rc));
+	if (rc < 0)
+		GOTO(out, rc = err_serious(rc));
 
-	/* Read current HSM info */
-	ma->ma_valid = 0;
-	ma->ma_need = MA_HSM;
-	rc = mdt_attr_get_complex(info, obj, ma);
-	if (rc)
+	lh = &info->mti_lh[MDT_LH_CHILD];
+	mdt_lock_reg_init(lh, LCK_PW);
+	rc = mdt_object_lock(info, obj, lh, MDS_INODELOCK_LOOKUP |
+			     MDS_INODELOCK_XATTR, MDT_LOCAL_LOCK);
+	if (rc < 0)
 		GOTO(out_ucred, rc);
 
-	hss = req_capsule_client_get(info->mti_pill, &RMF_HSM_STATE_SET);
-	if (hss == NULL)
-		GOTO(out_ucred, rc = -EPROTO);
-
 	if (req_capsule_get_size(info->mti_pill, &RMF_CAPA1, RCL_CLIENT))
 		mdt_set_capainfo(info, 0, &info->mti_body->fid1,
 			    req_capsule_client_get(info->mti_pill, &RMF_CAPA1));
 
+	/* Non-root users are forbidden to set or clear flags which are
+	 * NOT defined in HSM_USER_MASK. */
+	if (((hss->hss_setmask | hss->hss_clearmask) & ~HSM_USER_MASK) &&
+	    !md_capable(mdt_ucred(info), CFS_CAP_SYS_ADMIN))
+		GOTO(out_unlock, rc = -EPERM);
+
+	/* Read current HSM info */
+	ma->ma_valid = 0;
+	ma->ma_need = MA_HSM;
+	rc = mdt_attr_get_complex(info, obj, ma);
+	if (rc)
+		GOTO(out_unlock, rc);
+
 	/* Change HSM flags depending on provided masks */
 	if (hss->hss_valid & HSS_SETMASK)
 		ma->ma_hsm.mh_flags |= hss->hss_setmask;
@@ -315,7 +313,7 @@ int mdt_hsm_state_set(struct mdt_thread_info *info)
 			CDEBUG(D_HSM, "Could not set an archive number for "
 			       DFID "if HSM EXISTS flag is not set.\n",
 			       PFID(&info->mti_body->fid1));
-			GOTO(out_ucred, rc);
+			GOTO(out_unlock, rc);
 		}
 		ma->ma_hsm.mh_arch_id = hss->hss_archive_id;
 	}
@@ -327,10 +325,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);
@@ -340,14 +338,16 @@ int mdt_hsm_state_set(struct mdt_thread_info *info)
 	/* Save the modified flags */
 	rc = mdt_hsm_attr_set(info, obj, &ma->ma_hsm);
 	if (rc)
-		GOTO(out_ucred, rc);
+		GOTO(out_unlock, rc);
 
 	EXIT;
 
+out_unlock:
+	mdt_object_unlock(info, obj, lh, 1);
 out_ucred:
 	mdt_exit_ucred(info);
-out_obj:
-	mdt_object_unlock(info, obj, lh, 1);
+out:
+	mdt_thread_info_fini(info);
 	return rc;
 }
 
@@ -357,8 +357,9 @@ out_obj:
  *
  * This is MDS_HSM_ACTION RPC handler.
  */
-int mdt_hsm_action(struct mdt_thread_info *info)
+int mdt_hsm_action(struct tgt_session_info *tsi)
 {
+	struct mdt_thread_info		*info;
 	struct hsm_current_action	*hca;
 	struct hsm_action_list		*hal = NULL;
 	struct hsm_action_item		*hai;
@@ -366,21 +367,25 @@ int mdt_hsm_action(struct mdt_thread_info *info)
 	int				 rc;
 	ENTRY;
 
+	hca = req_capsule_server_get(tsi->tsi_pill,
+				     &RMF_MDS_HSM_CURRENT_ACTION);
+	if (hca == NULL)
+		RETURN(err_serious(-EPROTO));
+
+	if (tsi->tsi_mdt_body == NULL)
+		RETURN(-EPROTO);
+
+	info = tsi2mdt_info(tsi);
 	/* Only valid if client is remote */
 	rc = mdt_init_ucred(info, (struct mdt_body *)info->mti_body);
 	if (rc)
-		RETURN(rc = err_serious(rc));
+		GOTO(out, rc = err_serious(rc));
 
-	if (req_capsule_get_size(info->mti_pill, &RMF_CAPA1, RCL_CLIENT))
+	if (req_capsule_get_size(tsi->tsi_pill, &RMF_CAPA1, RCL_CLIENT))
 		mdt_set_capainfo(info, 0, &info->mti_body->fid1,
 				 req_capsule_client_get(info->mti_pill,
 							&RMF_CAPA1));
 
-	hca = req_capsule_server_get(info->mti_pill,
-				     &RMF_MDS_HSM_CURRENT_ACTION);
-	if (hca == NULL)
-		GOTO(out_ucred, rc = -EPROTO);
-
 	/* Coordinator information */
 	hal_size = sizeof(*hal) +
 		   cfs_size_round(MTI_NAME_MAXLEN) /* fsname */ +
@@ -396,14 +401,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);
 
@@ -444,6 +449,8 @@ out_free:
 	MDT_HSM_FREE(hal, hal_size);
 out_ucred:
 	mdt_exit_ucred(info);
+out:
+	mdt_thread_info_fini(info);
 	return rc;
 }
 
@@ -455,10 +462,10 @@ out_ucred:
  *
  * This is MDS_HSM_REQUEST RPC handler.
  */
-int mdt_hsm_request(struct mdt_thread_info *info)
+int mdt_hsm_request(struct tgt_session_info *tsi)
 {
-	struct req_capsule		*pill = info->mti_pill;
-	struct mdt_body			*body;
+	struct mdt_thread_info		*info;
+	struct req_capsule		*pill = tsi->tsi_pill;
 	struct hsm_request		*hr;
 	struct hsm_user_item		*hui;
 	struct hsm_action_list		*hal;
@@ -471,12 +478,11 @@ int mdt_hsm_request(struct mdt_thread_info *info)
 	int				 hal_size, i, rc;
 	ENTRY;
 
-	body = req_capsule_client_get(pill, &RMF_MDT_BODY);
 	hr = req_capsule_client_get(pill, &RMF_MDS_HSM_REQUEST);
 	hui = req_capsule_client_get(pill, &RMF_MDS_HSM_USER_ITEM);
 	data = req_capsule_client_get(pill, &RMF_GENERIC_DATA);
 
-	if (body == NULL || hr == NULL || hui == NULL || data == NULL)
+	if (tsi->tsi_mdt_body == NULL || hr == NULL || hui == NULL || data == NULL)
 		RETURN(-EPROTO);
 
 	/* Sanity check. Nothing to do with an empty list */
@@ -492,10 +498,11 @@ int mdt_hsm_request(struct mdt_thread_info *info)
 	if (data_size != hr->hr_data_len)
 		RETURN(-EPROTO);
 
+	info = tsi2mdt_info(tsi);
 	/* Only valid if client is remote */
-	rc = mdt_init_ucred(info, body);
+	rc = mdt_init_ucred(info, (struct mdt_body *)info->mti_body);
 	if (rc)
-		RETURN(err_serious(rc));
+		GOTO(out, rc);
 
 	switch (hr->hr_action) {
 	/* code to be removed in hsm1_merge and final patch */
@@ -536,8 +543,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;
@@ -545,17 +552,17 @@ 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);
+out:
+	mdt_thread_info_fini(info);
 	return rc;
 }