diff --git a/[refs] b/[refs] index 947f08a14ddf..70f49535e6f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b8249f6178cb2b68b9d683587797270125cc06a +refs/heads/master: 420d2a1028b906f24e836e37089a6ad55ab1848f diff --git a/trunk/fs/gfs2/glock.c b/trunk/fs/gfs2/glock.c index e7075945b051..b8aa816bb6eb 100644 --- a/trunk/fs/gfs2/glock.c +++ b/trunk/fs/gfs2/glock.c @@ -1880,7 +1880,7 @@ static int dump_glock(struct glock_iter *gi, struct gfs2_glock *gl) if (test_bit(GLF_DEMOTE, &gl->gl_flags)) { print_dbg(gi, " Demotion req to state %u (%llu uS ago)\n", gl->gl_demote_state, - (u64)(jiffies - gl->gl_demote_time)*1000000/HZ); + (u64)(jiffies - gl->gl_demote_time)*(1000000/HZ)); } if (gl->gl_ops == &gfs2_inode_glops && gl->gl_object) { if (!test_bit(GLF_LOCK, &gl->gl_flags) &&