From: Henri Doreau <henri.dor...@cea.fr>

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.dor...@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.xi...@intel.com>
Reviewed-by: Robert Read <robert.r...@intel.com>
Reviewed-by: John L. Hammond <john.hamm...@intel.com>
Reviewed-by: Oleg Drokin <oleg.dro...@intel.com>
Signed-off-by: James Simmons <jsimm...@infradead.org>
---
 drivers/staging/lustre/lustre/llite/dir.c |    4 ++--
 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 64a32d5..ce05493 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;
                }
        }
 
-- 
1.7.1

Reply via email to