]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
staging: lustre: llite: Inform copytool of dataversion changes
authorHenri Doreau <henri.doreau@cea.fr>
Thu, 27 Oct 2016 22:11:59 +0000 (18:11 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 30 Oct 2016 15:02:33 +0000 (11:02 -0400)
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>
drivers/staging/lustre/lustre/llite/dir.c

index 64a32d5dd116dc2dc1a5ae7cb71d27a851501028..ce05493bd7685addd279d22485ac0e059b60c542 100644 (file)
@@ -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;
                }
        }