LU-8080 utils: Replace calls to signal with sigaction

[fs/lustre-release.git] / lustre / utils / liblustreapi_hsm.c

diff --git a/lustre/utils/liblustreapi_hsm.c b/lustre/utils/liblustreapi_hsm.c
index b7678d7..0b12f37 100644 (file)
--- a/lustre/utils/liblustreapi_hsm.c
+++ b/lustre/utils/liblustreapi_hsm.c
@@ -472,9 +472,10 @@ out_free:
  */
 int llapi_hsm_register_event_fifo(const char *path)
 {
-       int rc;
        int read_fd;
        struct stat statbuf;
+       struct sigaction ignore_action;
+       int rc;
 
        /* Create the FIFO if necessary. */
        if ((mkfifo(path, 0644) < 0) && (errno != EEXIST)) {
@@ -523,7 +524,10 @@ int llapi_hsm_register_event_fifo(const char *path)
        }
 
        /* 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;
 }
@@ -1180,13 +1184,14 @@ int llapi_hsm_action_end(struct hsm_copyaction_private **phcp,
                        .lfu_ctime_nsec = hcp->stat.st_ctim.tv_nsec,
                };
 
-               /* Set {a,m,c}time of volatile file to that of original. */
-               if (ioctl(hcp->data_fd, LL_IOC_FUTIMES_3, &lfu) < 0) {
+               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;