X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Fliblustreapi_hsm.c;h=c4b5437b3f4e3b1252060045999e4a3703a4b1e8;hp=814ab2ce582cc607a96aa6d7c75729bd9c54facd;hb=848f9e20320cb7c01eaf7f1b5c27f5efd54e4818;hpb=40137f1d07295ee4a0bb75d2ae553c42e66295f4

diff --git a/lustre/utils/liblustreapi_hsm.c b/lustre/utils/liblustreapi_hsm.c
index 814ab2c..c4b5437 100644
--- a/lustre/utils/liblustreapi_hsm.c
+++ b/lustre/utils/liblustreapi_hsm.c
@@ -76,8 +76,8 @@ struct hsm_copytool_private {
  * \param archive_count
  * \param archives Which archive numbers this copytool is responsible for
  */
-int llapi_hsm_copytool_start(void **priv, char *fsname, int flags,
-			     int archive_count, int *archives)
+int llapi_hsm_copytool_start(struct hsm_copytool_private **priv, char *fsname,
+			     int flags, int archive_count, int *archives)
 {
 	struct hsm_copytool_private	*ct;
 	int				 rc;
@@ -128,18 +128,18 @@ int llapi_hsm_copytool_start(void **priv, char *fsname, int flags,
 	ct->kuc.lk_data = ct->archives;
 	rc = root_ioctl(ct->fsname, LL_IOC_HSM_CT_START, &(ct->kuc), NULL,
 			WANT_ERROR);
-	/* ignore if it was already registered on coordinator */
-	if (rc == -EEXIST)
-		rc = 0;
 	/* Only the kernel reference keeps the write side open */
 	close(ct->kuc.lk_wfd);
 	ct->kuc.lk_wfd = 0;
 	if (rc < 0)
-		goto out_err;
+		goto out_kuc;
 
 	*priv = ct;
 	return 0;
 
+out_kuc:
+	/* cleanup the kuc channel */
+	libcfs_ukuc_stop(&ct->kuc);
 out_err:
 	if (ct->fsname)
 		free(ct->fsname);
@@ -152,11 +152,11 @@ out_err:
  * killed), the libcfs module will be referenced and unremovable,
  * even after Lustre services stop.
  */
-int llapi_hsm_copytool_fini(void **priv)
+int llapi_hsm_copytool_fini(struct hsm_copytool_private **priv)
 {
 	struct hsm_copytool_private *ct;
 
-	ct = (struct hsm_copytool_private *)priv;
+	ct = *priv;
 	if (!ct || (ct->magic != CT_PRIV_MAGIC))
 		return -EINVAL;
 
@@ -174,21 +174,19 @@ int llapi_hsm_copytool_fini(void **priv)
 }
 
 /** Wait for the next hsm_action_list
- * \param priv Opaque private control structure
+ * \param ct Opaque private control structure
  * \param halh Action list handle, will be allocated here
  * \param msgsize Number of bytes in the message, will be set here
  * \return 0 valid message received; halh and msgsize are set
  *	   <0 error code
  */
-int llapi_hsm_copytool_recv(void *priv, struct hsm_action_list **halh,
-			    int *msgsize)
+int llapi_hsm_copytool_recv(struct hsm_copytool_private *ct,
+			    struct hsm_action_list **halh, int *msgsize)
 {
-	struct hsm_copytool_private	*ct;
 	struct kuc_hdr			*kuch;
 	struct hsm_action_list		*hal;
 	int				 rc = 0;
 
-	ct = (struct hsm_copytool_private *)priv;
 	if (!ct || (ct->magic != CT_PRIV_MAGIC))
 		return -EINVAL;
 	if (halh == NULL || msgsize == NULL)