Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-6210 utils: Use C99 struct initializers in lfs_hsm_state()
[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
..
8fe05b4
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
*
* (C) Copyright 2012 Commissariat a l'energie atomique et aux energies
* alternatives
*
- * Copyright (c) 2013, 201
5
, Intel Corporation.
+ * Copyright (c) 2013, 201
6
, Intel Corporation.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Lesser General Public License
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the GNU Lesser General Public License
@@
-429,11
+429,12
@@
static int llapi_hsm_log_ct_progress(struct hsm_copyaction_private **phcp,
goto err;
}
goto err;
}
- if (progress_type == CT_RUNNING)
+ if (progress_type == CT_RUNNING)
{
rc = llapi_json_add_item(&json_items, "current_bytes",
LLAPI_JSON_BIGNUM, ¤t);
if (rc < 0)
goto err;
rc = llapi_json_add_item(&json_items, "current_bytes",
LLAPI_JSON_BIGNUM, ¤t);
if (rc < 0)
goto err;
+ }
cancel:
rc = llapi_json_add_item(&json_items, "event_type", LLAPI_JSON_STRING,
cancel:
rc = llapi_json_add_item(&json_items, "event_type", LLAPI_JSON_STRING,
@@
-472,9
+473,10
@@
out_free:
*/
int llapi_hsm_register_event_fifo(const char *path)
{
*/
int llapi_hsm_register_event_fifo(const char *path)
{
- int rc;
int read_fd;
struct stat statbuf;
int read_fd;
struct stat statbuf;
+ struct sigaction ignore_action;
+ int rc;
/* Create the FIFO if necessary. */
if ((mkfifo(path, 0644) < 0) && (errno != EEXIST)) {
/* Create the FIFO if necessary. */
if ((mkfifo(path, 0644) < 0) && (errno != EEXIST)) {
@@
-523,7
+525,10
@@
int llapi_hsm_register_event_fifo(const char *path)
}
/* Ignore SIGPIPEs -- can occur if the reader goes away. */
}
/* 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;
}
return 0;
}
@@
-1121,12
+1126,18
@@
int llapi_hsm_action_begin(struct hsm_copyaction_private **phcp,
goto err_out;
}
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;
}
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:
llapi_hsm_log_ct_progress(&hcp, hai, CT_START, 0, 0);
ok_out:
@@
-1180,13
+1191,14
@@
int llapi_hsm_action_end(struct hsm_copyaction_private **phcp,
.lfu_ctime_nsec = hcp->stat.st_ctim.tv_nsec,
};
.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;
}
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;
if (rc < 0) {
errval = -errno;
goto end;