diff options
author | Manuel Schölling <manuel.schoelling@gmx.de> | 2014-05-22 16:42:37 -0400 |
---|---|---|
committer | Mike Snitzer <snitzer@redhat.com> | 2015-02-09 13:06:48 -0500 |
commit | 0f30af98cbb111cebd99f09cb7b8cc8c9351c0b3 (patch) | |
tree | 1fa005c7f05e77550f0ef6cd0a3752a0422786df /drivers/md/dm-log-userspace-base.c | |
parent | 3ca5a21a9c02bdebe2d95268482031f002efcf23 (diff) |
dm: use time_in_range() and time_after()
To be future-proof and for better readability the time comparisons are modified
to use time_in_range() and time_after() instead of plain, error-prone math.
Signed-off-by: Manuel Schölling <manuel.schoelling@gmx.de>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'drivers/md/dm-log-userspace-base.c')
-rw-r--r-- | drivers/md/dm-log-userspace-base.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/md/dm-log-userspace-base.c b/drivers/md/dm-log-userspace-base.c index b953db6cc229..03177ca0b009 100644 --- a/drivers/md/dm-log-userspace-base.c +++ b/drivers/md/dm-log-userspace-base.c | |||
@@ -6,6 +6,7 @@ | |||
6 | 6 | ||
7 | #include <linux/bio.h> | 7 | #include <linux/bio.h> |
8 | #include <linux/slab.h> | 8 | #include <linux/slab.h> |
9 | #include <linux/jiffies.h> | ||
9 | #include <linux/dm-dirty-log.h> | 10 | #include <linux/dm-dirty-log.h> |
10 | #include <linux/device-mapper.h> | 11 | #include <linux/device-mapper.h> |
11 | #include <linux/dm-log-userspace.h> | 12 | #include <linux/dm-log-userspace.h> |
@@ -829,7 +830,7 @@ static int userspace_is_remote_recovering(struct dm_dirty_log *log, | |||
829 | int r; | 830 | int r; |
830 | uint64_t region64 = region; | 831 | uint64_t region64 = region; |
831 | struct log_c *lc = log->context; | 832 | struct log_c *lc = log->context; |
832 | static unsigned long long limit; | 833 | static unsigned long limit; |
833 | struct { | 834 | struct { |
834 | int64_t is_recovering; | 835 | int64_t is_recovering; |
835 | uint64_t in_sync_hint; | 836 | uint64_t in_sync_hint; |
@@ -845,7 +846,7 @@ static int userspace_is_remote_recovering(struct dm_dirty_log *log, | |||
845 | */ | 846 | */ |
846 | if (region < lc->in_sync_hint) | 847 | if (region < lc->in_sync_hint) |
847 | return 0; | 848 | return 0; |
848 | else if (jiffies < limit) | 849 | else if (time_after(limit, jiffies)) |
849 | return 1; | 850 | return 1; |
850 | 851 | ||
851 | limit = jiffies + (HZ / 4); | 852 | limit = jiffies + (HZ / 4); |