diff options
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/dlm/lock.c | 2 | ||||
| -rw-r--r-- | fs/gfs2/glock.c | 2 | ||||
| -rw-r--r-- | fs/timerfd.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c index 35502d4046f5..f631a70407f6 100644 --- a/fs/dlm/lock.c +++ b/fs/dlm/lock.c | |||
| @@ -1395,7 +1395,7 @@ static int nodeid_warned(int nodeid, int num_nodes, int *warned) | |||
| 1395 | void dlm_scan_waiters(struct dlm_ls *ls) | 1395 | void dlm_scan_waiters(struct dlm_ls *ls) |
| 1396 | { | 1396 | { |
| 1397 | struct dlm_lkb *lkb; | 1397 | struct dlm_lkb *lkb; |
| 1398 | ktime_t zero = ktime_set(0, 0); | 1398 | ktime_t zero = 0; |
| 1399 | s64 us; | 1399 | s64 us; |
| 1400 | s64 debug_maxus = 0; | 1400 | s64 debug_maxus = 0; |
| 1401 | u32 debug_scanned = 0; | 1401 | u32 debug_scanned = 0; |
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index f7b3ba61add5..94f50cac91c6 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c | |||
| @@ -695,7 +695,7 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number, | |||
| 695 | gl->gl_target = LM_ST_UNLOCKED; | 695 | gl->gl_target = LM_ST_UNLOCKED; |
| 696 | gl->gl_demote_state = LM_ST_EXCLUSIVE; | 696 | gl->gl_demote_state = LM_ST_EXCLUSIVE; |
| 697 | gl->gl_ops = glops; | 697 | gl->gl_ops = glops; |
| 698 | gl->gl_dstamp = ktime_set(0, 0); | 698 | gl->gl_dstamp = 0; |
| 699 | preempt_disable(); | 699 | preempt_disable(); |
| 700 | /* We use the global stats to estimate the initial per-glock stats */ | 700 | /* We use the global stats to estimate the initial per-glock stats */ |
| 701 | gl->gl_stats = this_cpu_ptr(sdp->sd_lkstats)->lkstats[glops->go_type]; | 701 | gl->gl_stats = this_cpu_ptr(sdp->sd_lkstats)->lkstats[glops->go_type]; |
diff --git a/fs/timerfd.c b/fs/timerfd.c index fb4407a7cf9e..c173cc196175 100644 --- a/fs/timerfd.c +++ b/fs/timerfd.c | |||
| @@ -155,7 +155,7 @@ static ktime_t timerfd_get_remaining(struct timerfd_ctx *ctx) | |||
| 155 | else | 155 | else |
| 156 | remaining = hrtimer_expires_remaining_adjusted(&ctx->t.tmr); | 156 | remaining = hrtimer_expires_remaining_adjusted(&ctx->t.tmr); |
| 157 | 157 | ||
| 158 | return remaining < 0 ? ktime_set(0, 0): remaining; | 158 | return remaining < 0 ? 0: remaining; |
| 159 | } | 159 | } |
| 160 | 160 | ||
| 161 | static int timerfd_setup(struct timerfd_ctx *ctx, int flags, | 161 | static int timerfd_setup(struct timerfd_ctx *ctx, int flags, |
