staging: lustre: llite: Report first encountered error

Failures in ll_ioc_copy_{start,end} are reported to coordinator.
The return code delivered to the caller should indicate what this
error was, not whether coordinator was successfully notified.

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/14335
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>

diff --git a/drivers/staging/lustre/lustre/llite/dir.c b/drivers/staging/lustre/lustre/llite/dir.c
index 36413273a86bac11713863b3865dd7d99146cedf..68675ebf5d5685f0682076a133f4d658a286f0fb 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/dir.c
+++ b/drivers/staging/lustre/lustre/llite/dir.c
@@ -681,7 +681,7 @@ static int ll_ioc_copy_start(struct super_block *sb, struct hsm_copy *copy)
 {
        struct ll_sb_info               *sbi = ll_s2sbi(sb);
        struct hsm_progress_kernel       hpk;
-       int                              rc;
+       int rc2, rc = 0;
 
        /* Forge a hsm_progress based on data from copy. */
        hpk.hpk_fid = copy->hc_hai.hai_fid;
@@ -731,10 +731,10 @@ 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);
+       rc2 = obd_iocontrol(LL_IOC_HSM_PROGRESS, sbi->ll_md_exp, sizeof(hpk),
+                           &hpk, NULL);
 
-       return rc;
+       return rc ? rc : rc2;
 }
 
 /**
@@ -756,7 +756,7 @@ static int ll_ioc_copy_end(struct super_block *sb, struct hsm_copy *copy)
 {
        struct ll_sb_info               *sbi = ll_s2sbi(sb);
        struct hsm_progress_kernel       hpk;
-       int                              rc;
+       int rc2, rc = 0;
 
        /* If you modify the logic here, also check llapi_hsm_copy_end(). */
        /* Take care: copy->hc_hai.hai_action, len, gid and data are not
@@ -830,10 +830,10 @@ static int ll_ioc_copy_end(struct super_block *sb, struct hsm_copy *copy)
        }
 
 progress:
-       rc = obd_iocontrol(LL_IOC_HSM_PROGRESS, sbi->ll_md_exp, sizeof(hpk),
-                          &hpk, NULL);
+       rc2 = obd_iocontrol(LL_IOC_HSM_PROGRESS, sbi->ll_md_exp, sizeof(hpk),
+                           &hpk, NULL);
 
-       return rc;
+       return rc ? rc : rc2;
 }
 
 static int copy_and_ioctl(int cmd, struct obd_export *exp,