LU-6142 uapi: Get rid of lustre_fid typedef

[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..486be87 100644 (file)
--- 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, 2015, Intel Corporation.
+ * Copyright (c) 2013, 2016, Intel Corporation.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Lesser General Public License
@@ -57,8 +57,7 @@
 #include <unistd.h>
 #endif
 
-#include <lnet/lnetctl.h>
-#include <lustre/lustre_idl.h>
+#include <linux/lnet/lnetctl.h>
 #include <lustre/lustreapi.h>
 #include "lustreapi_internal.h"
 
@@ -429,11 +428,12 @@ static int llapi_hsm_log_ct_progress(struct hsm_copyaction_private **phcp,
                        goto err;
        }
 
-       if (progress_type == CT_RUNNING)
+       if (progress_type == CT_RUNNING) {
                rc = llapi_json_add_item(&json_items, "current_bytes",
                                         LLAPI_JSON_BIGNUM, &current);
                if (rc < 0)
                        goto err;
+       }
 
 cancel:
        rc = llapi_json_add_item(&json_items, "event_type", LLAPI_JSON_STRING,
@@ -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;
 }
@@ -929,7 +933,7 @@ out_err:
  * \param parent_len Destination buffer size.
  * \return 0 on success.
  */
-static int fid_parent(const char *mnt, const lustre_fid *fid, char *parent,
+static int fid_parent(const char *mnt, const struct lu_fid *fid, char *parent,
                      size_t parent_len)
 {
        int              rc;
@@ -1121,12 +1125,18 @@ int llapi_hsm_action_begin(struct hsm_copyaction_private **phcp,
                        goto err_out;
        }
 
+       /* Since remove is atomic there is no need to send an initial
+        * MDS_HSM_PROGRESS RPC. */
+       if (hai->hai_action == HSMA_REMOVE)
+               goto out_log;
+
        rc = ioctl(ct->mnt_fd, LL_IOC_HSM_COPY_START, &hcp->copy);
        if (rc < 0) {
                rc = -errno;
                goto err_out;
        }
 
+out_log:
        llapi_hsm_log_ct_progress(&hcp, hai, CT_START, 0, 0);
 
 ok_out:
@@ -1180,13 +1190,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;
@@ -1269,7 +1280,7 @@ int llapi_hsm_action_progress(struct hsm_copyaction_private *hcp,
  * @return error code if the action is not a copy operation.
  */
 int llapi_hsm_action_get_dfid(const struct hsm_copyaction_private *hcp,
-                             lustre_fid *fid)
+                             struct lu_fid *fid)
 {
        const struct hsm_action_item    *hai = &hcp->copy.hc_hai;
 
@@ -1326,7 +1337,7 @@ int llapi_hsm_action_get_fd(const struct hsm_copyaction_private *hcp)
 int llapi_hsm_import(const char *dst, int archive, const struct stat *st,
                     unsigned long long stripe_size, int stripe_offset,
                     int stripe_count, int stripe_pattern, char *pool_name,
-                    lustre_fid *newfid)
+                    struct lu_fid *newfid)
 {
        struct hsm_user_import   hui;
        int                      fd;