[PATCH] md: Use time_in_range()

[Manuel Schölling]

To be future-proof and for better readability the time comparisons are modified
to use time_in_range() instead of plain, error-prone math.

Signed-off-by: Manuel Schölling <manuel.schoell...@gmx.de>
---
 drivers/md/dm-cache-target.c       |    5 +++--
 drivers/md/dm-log-userspace-base.c |    4 ++--
 drivers/md/dm-thin.c               |    5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/md/dm-cache-target.c b/drivers/md/dm-cache-target.c
index 9380be7..4378d1d 100644
--- a/drivers/md/dm-cache-target.c
+++ b/drivers/md/dm-cache-target.c
@@ -1429,8 +1429,9 @@ static void process_bio(struct cache *cache, struct 
prealloc *structs,
 
 static int need_commit_due_to_time(struct cache *cache)
 {
-       return jiffies < cache->last_commit_jiffies ||
-              jiffies > cache->last_commit_jiffies + COMMIT_PERIOD;
+       return !time_in_range(jiffies,
+             cache->last_commit_jiffies,
+             cache->last_commit_jiffies + COMMIT_PERIOD);
 }
 
 static int commit_if_needed(struct cache *cache)
diff --git a/drivers/md/dm-log-userspace-base.c 
b/drivers/md/dm-log-userspace-base.c
index b953db6..cd9b171 100644
--- a/drivers/md/dm-log-userspace-base.c
+++ b/drivers/md/dm-log-userspace-base.c
@@ -829,7 +829,7 @@ static int userspace_is_remote_recovering(struct 
dm_dirty_log *log,
        int r;
        uint64_t region64 = region;
        struct log_c *lc = log->context;
-       static unsigned long long limit;
+       static unsigned long limit;
        struct {
                int64_t is_recovering;
                uint64_t in_sync_hint;
@@ -845,7 +845,7 @@ static int userspace_is_remote_recovering(struct 
dm_dirty_log *log,
         */
        if (region < lc->in_sync_hint)
                return 0;
-       else if (jiffies < limit)
+       else if (time_after(limit, jiffies))
                return 1;
 
        limit = jiffies + (HZ / 4);
diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c
index 2e71de8..c83b363 100644
--- a/drivers/md/dm-thin.c
+++ b/drivers/md/dm-thin.c
@@ -1375,8 +1375,9 @@ static void process_bio_fail(struct thin_c *tc, struct 
bio *bio)
  */
 static int need_commit_due_to_time(struct pool *pool)
 {
-       return jiffies < pool->last_commit_jiffies ||
-              jiffies > pool->last_commit_jiffies + COMMIT_PERIOD;
+       return !time_in_range(jiffies,
+             pool->last_commit_jiffies,
+             pool->last_commit_jiffies + COMMIT_PERIOD);
 }
 
 #define thin_pbd(node) rb_entry((node), struct dm_thin_endio_hook, rb_node)
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/