summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurelien Degremont <aurelien.degremont@cea.fr>2016-04-05 01:36:53 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-04-12 03:47:04 (GMT)
commitc5300d55e2d5769ff4cffce3e667d991ed30eac8 (patch)
tree15c8e03bcdf92aef6a2267f5737c7ae5d18a2ff7
parent18ecab0d95b0bb878cc7e22eb615cef21fcdd8eb (diff)
downloadlinux-c5300d55e2d5769ff4cffce3e667d991ed30eac8.tar.xz
staging: lustre: hsm: copy start error should set HP_FLAG_COMPLETED
If an error occurs when initializing a HSM request, in ll_ioc_copy_start(), the PROGRESS message, sent to coordinator, should carry the error code but also HP_FLAG_COMPLETED to mark the request as finished (with error). If not, the Coordinator will ignore this message and consider the request is still running. Signed-off-by: Aurelien Degremont <aurelien.degremont@cea.fr> Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3685 Reviewed-on: http://review.whamcloud.com/7265 Reviewed-by: Jinshan Xiong <jinshan.xiong@intel.com> Reviewed-by: John L. Hammond <john.hammond@intel.com> Reviewed-by: Oleg Drokin <oleg.drokin@intel.com> Signed-off-by: James Simmons <jsimmons@infradead.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/lustre/lustre/llite/dir.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/staging/lustre/lustre/llite/dir.c b/drivers/staging/lustre/lustre/llite/dir.c
index eb2e79e..955acd4 100644
--- a/drivers/staging/lustre/lustre/llite/dir.c
+++ b/drivers/staging/lustre/lustre/llite/dir.c
@@ -958,6 +958,9 @@ static int ll_ioc_copy_start(struct super_block *sb, struct hsm_copy *copy)
}
progress:
+ /* On error, the request should be considered as completed */
+ if (hpk.hpk_errval > 0)
+ hpk.hpk_flags |= HP_FLAG_COMPLETED;
rc = obd_iocontrol(LL_IOC_HSM_PROGRESS, sbi->ll_md_exp, sizeof(hpk),
&hpk, NULL);