From: Henri Doreau <henri.doreau@cea.fr>
Date: Tue, 7 Apr 2015 13:10:12 +0000 (+0200)
Subject: LU-5683 llite: Inform copytool of dataversion changes
X-Git-Tag: 2.7.59~8
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=f99c0178e6d90bc6674f9d6a4e724b2c113b4a43;p=fs%2Flustre-release.git

LU-5683 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>
Change-Id: I0608a0ed06cf5d45eb140ac3e32e2b58baafdf0e
Reviewed-on: http://review.whamcloud.com/14377
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
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>
---

diff --git a/lustre/llite/dir.c b/lustre/llite/dir.c
index a098c62..af02f98 100644
--- a/lustre/llite/dir.c
+++ b/lustre/llite/dir.c
@@ -889,10 +889,11 @@ static int ll_ioc_copy_end(struct super_block *sb, struct hsm_copy *copy)
 			 * The policy engine will ask for a new archive later
 			 * 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;
+			GOTO(progress, rc);
 		}
 
 	}