Fix coverity defects: CID 147540, 147542

CID 147540: unsigned_compare
- Cast nsec to a int32_t to properly detect the expected overflow.
CID 147542: unsigned_compare
- intval can never be less than ZIO_FAILURE_MODE_WAIT which is
  defined to be zero.  Remove this useless check.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: cao.xuewen <cao.xuewen@zte.com.cn>
Closes #5379

diff --git a/include/zpios-ctl.h b/include/zpios-ctl.h
index aee4f0a50125ac02fe29b1800c26940cc9f4aee2..90efcb1b182c69f0340786981fb9bbd38d5dff0b 100644 (file)
--- a/include/zpios-ctl.h
+++ b/include/zpios-ctl.h
@@ -146,7 +146,7 @@ zpios_timespec_normalize(zpios_timespec_t *ts, uint32_t sec, uint32_t nsec)
                nsec -= NSEC_PER_SEC;
                sec++;
        }
-       while (nsec < 0) {
+       while (((int32_t)nsec) < 0) {
                nsec += NSEC_PER_SEC;
                sec--;
        }

diff --git a/module/zfs/spa.c b/module/zfs/spa.c
index ec6924a020b46e74c68abc730bc6f3f46f2771d4..05e15a2e6d599b21b5ef14801e32f33bef2e2d8a 100644 (file)
--- a/module/zfs/spa.c
+++ b/module/zfs/spa.c
@@ -555,8 +555,7 @@ spa_prop_validate(spa_t *spa, nvlist_t *props)
 
                case ZPOOL_PROP_FAILUREMODE:
                        error = nvpair_value_uint64(elem, &intval);
-                       if (!error && (intval < ZIO_FAILURE_MODE_WAIT ||
-                           intval > ZIO_FAILURE_MODE_PANIC))
+                       if (!error && intval > ZIO_FAILURE_MODE_PANIC)
                                error = SET_ERROR(EINVAL);
 
                        /*