diff options
| author | David S. Miller <davem@davemloft.net> | 2015-02-18 02:48:51 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-18 02:48:51 (GMT) |
| commit | fece13ca005a5f559147e9424321f4b5e01272b4 (patch) | |
| tree | 54e762e70afb664d14152e6bcf89a48be3fb9c13 /drivers/md/dm-log-userspace-base.c | |
| parent | 855e7e7174bade3f2b63077a81eea5aab525dbf6 (diff) | |
| parent | f5af19d10d151c5a2afae3306578f485c244db25 (diff) | |
| download | linux-fece13ca005a5f559147e9424321f4b5e01272b4.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
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 b953db6..03177ca 100644 --- a/drivers/md/dm-log-userspace-base.c +++ b/drivers/md/dm-log-userspace-base.c @@ -6,6 +6,7 @@ #include <linux/bio.h> #include <linux/slab.h> +#include <linux/jiffies.h> #include <linux/dm-dirty-log.h> #include <linux/device-mapper.h> #include <linux/dm-log-userspace.h> @@ -829,7 +830,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 +846,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); |