From: Steven Whitehouse Date: Sun, 18 Mar 2007 16:05:27 +0000 (+0000) Subject: [GFS2] Fix a bug on i386 due to evaluation order X-Git-Tag: v2.6.22-rc1~820^2~28 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=420d2a1028b906f24e836e37089a6ad55ab1848f;p=linux-2.6-omap-h63xx.git [GFS2] Fix a bug on i386 due to evaluation order Since gcc didn't evaluate the last two terms of the expression in glock.c:1881 as a constant expression, it resulted in an error on i386 due to the lack of a 64bit divide instruction. This adds some brackets to fix the problem. This was reported by Andrew Morton. Signed-off-by: Steven Whitehouse Cc: Andrew Morton --- diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index e7075945b05..b8aa816bb6e 100644 --- a/fs/gfs2/glock.c +++ b/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) &&