diff options
| author | Steven Whitehouse | 2007-03-18 17:05:27 +0100 |
|---|---|---|
| committer | Steven Whitehouse | 2007-05-01 10:10:42 +0200 |
| commit | 420d2a1028b906f24e836e37089a6ad55ab1848f (patch) | |
| tree | a0fa71778dcec08d461aba2e75b045878b483498 /fs/gfs2 | |
| parent | [GFS2] Fix bz 224480 and cleanup glock demotion code (diff) | |
| download | kernel-qcow2-linux-420d2a1028b906f24e836e37089a6ad55ab1848f.tar.gz kernel-qcow2-linux-420d2a1028b906f24e836e37089a6ad55ab1848f.tar.xz kernel-qcow2-linux-420d2a1028b906f24e836e37089a6ad55ab1848f.zip | |
[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>
Diffstat (limited to 'fs/gfs2')
| -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) 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) && |