diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2007-03-18 12:05:27 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2007-05-01 04:10:42 -0400 |
commit | 420d2a1028b906f24e836e37089a6ad55ab1848f (patch) | |
tree | a0fa71778dcec08d461aba2e75b045878b483498 | |
parent | 3b8249f6178cb2b68b9d683587797270125cc06a (diff) |
[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>
-rw-r--r-- | fs/gfs2/glock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index e7075945b051..b8aa816bb6eb 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) | |||
1880 | if (test_bit(GLF_DEMOTE, &gl->gl_flags)) { | 1880 | if (test_bit(GLF_DEMOTE, &gl->gl_flags)) { |
1881 | print_dbg(gi, " Demotion req to state %u (%llu uS ago)\n", | 1881 | print_dbg(gi, " Demotion req to state %u (%llu uS ago)\n", |
1882 | gl->gl_demote_state, | 1882 | gl->gl_demote_state, |
1883 | (u64)(jiffies - gl->gl_demote_time)*1000000/HZ); | 1883 | (u64)(jiffies - gl->gl_demote_time)*(1000000/HZ)); |
1884 | } | 1884 | } |
1885 | if (gl->gl_ops == &gfs2_inode_glops && gl->gl_object) { | 1885 | if (gl->gl_ops == &gfs2_inode_glops && gl->gl_object) { |
1886 | if (!test_bit(GLF_LOCK, &gl->gl_flags) && | 1886 | if (!test_bit(GLF_LOCK, &gl->gl_flags) && |