X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_hsm.c;h=d4cf668b2bc9b2353be3893a19940a8b2df090ee;hb=d9f95aa201341d972eeb610471e3c45f1ba12202;hp=237663a18860d664e46129b8db39dee6755a6f46;hpb=2b294992edce5af7b79d4300ed3aa1ea6a8db850;p=fs%2Flustre-release.git

diff --git a/lustre/mdt/mdt_hsm.c b/lustre/mdt/mdt_hsm.c
index 237663a..d4cf668 100644
--- a/lustre/mdt/mdt_hsm.c
+++ b/lustre/mdt/mdt_hsm.c
@@ -22,9 +22,9 @@
 /*
  * Copyright (c) 2011, 2012 Commissariat a l'energie atomique et aux energies
  *                          alternatives
- *
- * Copyright (c) 2012, 2014, Intel Corporation.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, 2015, Intel Corporation.
  */
 /*
  * lustre/mdt/mdt_hsm.c
@@ -70,7 +70,7 @@ int mdt_hsm_attr_set(struct mdt_thread_info *info, struct mdt_object *obj,
 	/* pack HSM attributes */
 	lustre_hsm2buf(info->mti_xattr_buf, mh);
 
-	/* update SOM attributes */
+	/* update HSM attributes */
 	buf->lb_buf = attrs;
 	buf->lb_len = sizeof(*attrs);
 	rc = mo_xattr_set(info->mti_env, next, buf, XATTR_NAME_HSM, 0);
@@ -214,8 +214,7 @@ int mdt_hsm_state_get(struct tgt_session_info *tsi)
 
 	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);
+	rc = mdt_object_lock(info, obj, lh, MDS_INODELOCK_LOOKUP);
 	if (rc < 0)
 		GOTO(out_ucred, rc);
 
@@ -225,11 +224,6 @@ int mdt_hsm_state_get(struct tgt_session_info *tsi)
 	if (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->mbo_fid1,
-				 req_capsule_client_get(info->mti_pill,
-				 &RMF_CAPA1));
-
 	hus = req_capsule_server_get(tsi->tsi_pill, &RMF_HSM_USER_STATE);
 	if (hus == NULL)
 		GOTO(out_unlock, rc = -EPROTO);
@@ -253,7 +247,7 @@ out:
  *
  * Archive number is changed iif the value is not 0.
  * The new flagset that will be computed should result in a coherent state.
- * This function checks that are flags are compatible.
+ * This function checks that flags are compatible.
  *
  * This is MDS_HSM_STATE_SET RPC handler.
  */
@@ -281,19 +275,27 @@ int mdt_hsm_state_set(struct tgt_session_info *tsi)
 	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);
+			     MDS_INODELOCK_XATTR);
 	if (rc < 0)
 		GOTO(out_ucred, rc);
 
-	if (req_capsule_get_size(info->mti_pill, &RMF_CAPA1, RCL_CLIENT))
-		mdt_set_capainfo(info, 0, &info->mti_body->mbo_fid1,
-			    req_capsule_client_get(info->mti_pill, &RMF_CAPA1));
+	/* Detect out-of range masks */
+	if ((hss->hss_setmask | hss->hss_clearmask) & ~HSM_FLAGS_MASK) {
+		CDEBUG(D_HSM, "Incompatible masks provided (set "LPX64
+		       ", clear "LPX64") vs supported set (%#x).\n",
+		       hss->hss_setmask, hss->hss_clearmask, HSM_FLAGS_MASK);
+		GOTO(out_unlock, rc = -EINVAL);
+	}
 
 	/* 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))
+	    !md_capable(mdt_ucred(info), CFS_CAP_SYS_ADMIN)) {
+		CDEBUG(D_HSM, "Incompatible masks provided (set "LPX64
+		       ", clear "LPX64") vs unprivileged set (%#x).\n",
+		       hss->hss_setmask, hss->hss_clearmask, HSM_USER_MASK);
 		GOTO(out_unlock, rc = -EPERM);
+	}
 
 	/* Read current HSM info */
 	ma->ma_valid = 0;
@@ -316,6 +318,14 @@ int mdt_hsm_state_set(struct tgt_session_info *tsi)
 			       PFID(&info->mti_body->mbo_fid1));
 			GOTO(out_unlock, rc);
 		}
+
+		/* Detect out-of range archive id */
+		if (hss->hss_archive_id > LL_HSM_MAX_ARCHIVE) {
+			CDEBUG(D_HSM, "archive id %u exceeds maximum %zu.\n",
+			       hss->hss_archive_id, LL_HSM_MAX_ARCHIVE);
+			GOTO(out_unlock, rc = -EINVAL);
+		}
+
 		ma->ma_hsm.mh_arch_id = hss->hss_archive_id;
 	}
 
@@ -382,11 +392,6 @@ int mdt_hsm_action(struct tgt_session_info *tsi)
 	if (rc)
 		GOTO(out, rc = err_serious(rc));
 
-	if (req_capsule_get_size(tsi->tsi_pill, &RMF_CAPA1, RCL_CLIENT))
-		mdt_set_capainfo(info, 0, &info->mti_body->mbo_fid1,
-				 req_capsule_client_get(info->mti_pill,
-							&RMF_CAPA1));
-
 	/* Coordinator information */
 	hal_size = sizeof(*hal) +
 		   cfs_size_round(MTI_NAME_MAXLEN) /* fsname */ +