X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fliblustreapi_hsm.c;h=0b12f373688f6544de6179be595d2a09c891c0df;hb=72057a3af19ee02d9a686bd7e7d074917e381310;hp=b4dac67e2d9ec2f8b3645414515338f34f3a5bcd;hpb=32bd5051a518c57e35f51b7f3c7f739b5ef91b25;p=fs%2Flustre-release.git

diff --git a/lustre/utils/liblustreapi_hsm.c b/lustre/utils/liblustreapi_hsm.c
index b4dac67..0b12f37 100644
--- a/lustre/utils/liblustreapi_hsm.c
+++ b/lustre/utils/liblustreapi_hsm.c
@@ -6,7 +6,7 @@
  * (C) Copyright 2012 Commissariat a l'energie atomique et aux energies
  *     alternatives
  *
- * Copyright (c) 2013, 2014, Intel Corporation.
+ * Copyright (c) 2013, 2015, Intel Corporation.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Lesser General Public License
@@ -32,6 +32,7 @@
  * Author: Henri Doreau <henri.doreau@cea.fr>
  */
 
+#include <fcntl.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -43,11 +44,12 @@
 #include <dirent.h>
 #include <stdarg.h>
 #include <sys/stat.h>
+#include <sys/time.h>
 #include <sys/types.h>
+#include <time.h>
 #include <utime.h>
 #include <sys/syscall.h>
 #include <fnmatch.h>
-#include <glob.h>
 #include <signal.h>
 #ifdef HAVE_LINUX_UNISTD_H
 #include <linux/unistd.h>
@@ -55,7 +57,6 @@
 #include <unistd.h>
 #endif
 
-#include <libcfs/libcfs.h>
 #include <lnet/lnetctl.h>
 #include <lustre/lustre_idl.h>
 #include <lustre/lustreapi.h>
@@ -71,7 +72,7 @@ struct hsm_copytool_private {
 	struct kuc_hdr		*kuch;
 	int			 mnt_fd;
 	int			 open_by_fid_fd;
-	lustre_kernelcomm	 kuc;
+	struct lustre_kernelcomm kuc;
 	__u32			 archives;
 };
 
@@ -84,8 +85,6 @@ struct hsm_copyaction_private {
 	lstat_t					 stat;
 };
 
-#include <libcfs/libcfs.h>
-
 enum ct_progress_type {
 	CT_START	= 0,
 	CT_RUNNING	= 50,
@@ -475,6 +474,8 @@ int llapi_hsm_register_event_fifo(const char *path)
 {
 	int read_fd;
 	struct stat statbuf;
+	struct sigaction ignore_action;
+	int rc;
 
 	/* Create the FIFO if necessary. */
 	if ((mkfifo(path, 0644) < 0) && (errno != EEXIST)) {
@@ -509,19 +510,24 @@ int llapi_hsm_register_event_fifo(const char *path)
 	/* Open the FIFO for writes, but don't block on waiting
 	 * for a reader. */
 	llapi_hsm_event_fd = open(path, O_WRONLY | O_NONBLOCK);
-	if (llapi_hsm_event_fd < 0) {
-		llapi_error(LLAPI_MSG_ERROR, errno,
-			    "cannot open(%s) for write", path);
-		return -errno;
-	}
+	rc = -errno;
 
 	/* Now close the reader. An external monitoring process can
 	 * now open the FIFO for reads. If no reader comes along the
 	 * events are lost. NOTE: Only one reader at a time! */
 	close(read_fd);
 
+	if (llapi_hsm_event_fd < 0) {
+		llapi_error(LLAPI_MSG_ERROR, -rc,
+			    "cannot open(%s) for write", path);
+		return rc;
+	}
+
 	/* Ignore SIGPIPEs -- can occur if the reader goes away. */
-	signal(SIGPIPE, SIG_IGN);
+	memset(&ignore_action, 0, sizeof(ignore_action));
+	ignore_action.sa_handler = SIG_IGN;
+	sigemptyset(&ignore_action.sa_mask);
+	sigaction(SIGPIPE, &ignore_action, NULL);
 
 	return 0;
 }
@@ -731,7 +737,7 @@ int llapi_hsm_copytool_register(struct hsm_copytool_private **priv,
 			rc = -EINVAL;
 			goto out_err;
 		}
-		/* in the list we have a all archive wildcard
+		/* in the list we have an all archive wildcard
 		 * so move to all archives mode
 		 */
 		if (archives[rc] == 0) {
@@ -801,13 +807,17 @@ int llapi_hsm_copytool_unregister(struct hsm_copytool_private **priv)
 	if (ct->magic != CT_PRIV_MAGIC)
 		return -EINVAL;
 
+	/* Close the read side of the KUC pipe. This should be done
+	 * before unregistering to avoid deadlock: a ldlm_cb thread
+	 * enters libcfs_kkuc_group_put() acquires kg_sem and blocks
+	 * in pipe_write() due to full pipe; then we attempt to
+	 * unregister and block on kg_sem. */
+	libcfs_ukuc_stop(&ct->kuc);
+
 	/* Tell the kernel to stop sending us messages */
 	ct->kuc.lk_flags = LK_FLG_STOP;
 	ioctl(ct->mnt_fd, LL_IOC_HSM_CT_START, &ct->kuc);
 
-	/* Shut down the kernelcomms */
-	libcfs_ukuc_stop(&ct->kuc);
-
 	llapi_hsm_log_ct_registration(&ct, CT_UNREGISTER);
 
 	close(ct->open_by_fid_fd);
@@ -1165,19 +1175,23 @@ int llapi_hsm_action_end(struct hsm_copyaction_private **phcp,
 	hai = &hcp->copy.hc_hai;
 
 	if (hai->hai_action == HSMA_RESTORE && errval == 0) {
-		struct timeval tv[2];
-
-		/* Set {a,m}time of volatile file to that of original. */
-		tv[0].tv_sec = hcp->stat.st_atime;
-		tv[0].tv_usec = 0;
-		tv[1].tv_sec = hcp->stat.st_mtime;
-		tv[1].tv_usec = 0;
-		if (futimes(hcp->data_fd, tv) < 0) {
+		struct ll_futimes_3 lfu = {
+			.lfu_atime_sec = hcp->stat.st_atim.tv_sec,
+			.lfu_atime_nsec = hcp->stat.st_atim.tv_nsec,
+			.lfu_mtime_sec = hcp->stat.st_mtim.tv_sec,
+			.lfu_mtime_nsec = hcp->stat.st_mtim.tv_nsec,
+			.lfu_ctime_sec = hcp->stat.st_ctim.tv_sec,
+			.lfu_ctime_nsec = hcp->stat.st_ctim.tv_nsec,
+		};
+
+		rc = fsync(hcp->data_fd);
+		if (rc < 0) {
 			errval = -errno;
 			goto end;
 		}
 
-		rc = fsync(hcp->data_fd);
+		/* Set {a,m,c}time of volatile file to that of original. */
+		rc = ioctl(hcp->data_fd, LL_IOC_FUTIMES_3, &lfu);
 		if (rc < 0) {
 			errval = -errno;
 			goto end;