Commit 420d2a10 authored Mar 18, 2007 by Steven Whitehouse

[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 <swhiteho@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>

parent 3b8249f6

fs/gfs2/glock.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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) &&