Whamcloud - gitweb
LU-5417 tgt: incorrect return code from tgt_handle_lfsck_query 90/11290/3
authorDmitry Eremin <dmitry.eremin@intel.com>
Thu, 31 Jul 2014 09:31:27 +0000 (13:31 +0400)
committerOleg Drokin <oleg.drokin@intel.com>
Mon, 11 Aug 2014 05:39:08 +0000 (05:39 +0000)
Incorrect comparison of unsigned int with zero always false.
Therefore tgt_handle_lfsck_query() always return success.

Signed-off-by: Dmitry Eremin <dmitry.eremin@intel.com>
Change-Id: Idcb321880fb5071c93bebbba0a55961cdbe286dd
Reviewed-on: http://review.whamcloud.com/11290
Tested-by: Jenkins
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Fan Yong <fan.yong@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
lustre/target/tgt_handler.c

index bab3ff2..8742c9a 100644 (file)
@@ -1417,7 +1417,7 @@ static int tgt_handle_lfsck_query(struct tgt_session_info *tsi)
 {
        struct lfsck_request    *request;
        struct lfsck_reply      *reply;
 {
        struct lfsck_request    *request;
        struct lfsck_reply      *reply;
-       int                      rc      = 0;
+       int                      rc;
        ENTRY;
 
        request = req_capsule_client_get(tsi->tsi_pill, &RMF_LFSCK_REQUEST);
        ENTRY;
 
        request = req_capsule_client_get(tsi->tsi_pill, &RMF_LFSCK_REQUEST);
@@ -1428,12 +1428,10 @@ static int tgt_handle_lfsck_query(struct tgt_session_info *tsi)
        if (reply == NULL)
                RETURN(-ENOMEM);
 
        if (reply == NULL)
                RETURN(-ENOMEM);
 
-       reply->lr_status = tgt_lfsck_query(tsi->tsi_env,
-                                          tsi->tsi_tgt->lut_bottom, request);
-       if (reply->lr_status < 0)
-               rc = reply->lr_status;
+       rc = tgt_lfsck_query(tsi->tsi_env, tsi->tsi_tgt->lut_bottom, request);
+       reply->lr_status = rc;
 
 
-       RETURN(rc);
+       RETURN(rc < 0 ? rc : 0);
 }
 
 struct tgt_handler tgt_lfsck_handlers[] = {
 }
 
 struct tgt_handler tgt_lfsck_handlers[] = {