summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenri Doreau <henri.doreau@cea.fr>2016-10-28 01:11:59 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-10-30 18:02:33 +0300
commit539ff1393293d8d1060f1ef856868253fa7ac458 (patch)
tree2233ba23413b322becea061dba724d5f6409c4c6
parent4e724acca3af1fe377c0ce283d38fb107419a96d (diff)
downloadlinux-539ff1393293d8d1060f1ef856868253fa7ac458.tar.xz
staging: lustre: llite: Inform copytool of dataversion changes
Notify copytool that a file could not be archived due to dataversion change. This does not introduce any functional change but ensures that errors are consistently reported in copytool logs. Signed-off-by: Henri Doreau <henri.doreau@cea.fr> Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5683 Reviewed-on: http://review.whamcloud.com/14377 Reviewed-by: Jinshan Xiong <jinshan.xiong@intel.com> Reviewed-by: Robert Read <robert.read@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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/lustre/lustre/llite/dir.c b/drivers/staging/lustre/lustre/llite/dir.c
index 64a32d5dd116..ce05493bd768 100644
--- a/drivers/staging/lustre/lustre/llite/dir.c
+++ b/drivers/staging/lustre/lustre/llite/dir.c
@@ -837,10 +837,10 @@ static int ll_ioc_copy_end(struct super_block *sb, struct hsm_copy *copy)
* when the file will not be modified for some tunable
* time
*/
- /* we do not notify caller */
hpk.hpk_flags &= ~HP_FLAG_RETRY;
+ rc = -EBUSY;
/* hpk_errval must be >= 0 */
- hpk.hpk_errval = EBUSY;
+ hpk.hpk_errval = -rc;
}
}