GFS2: Eliminate 64-bit divides
authorBob Peterson <rpeterso@redhat.com>
Fri, 20 Jul 2012 18:05:05 +0000 (14:05 -0400)
committerSteven Whitehouse <swhiteho@redhat.com>
Fri, 20 Jul 2012 18:15:09 +0000 (19:15 +0100)
This patch removes the 64-bit divides introduced in the previous patch
in favor of shifting, so that it will compile properly on 32-bit machines.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
fs/gfs2/file.c

index 9f94832cefec303f8016f4949671ef23163dcb23..9aa6af13823c5b75d3e8d2723d281dc79cee7a47 100644 (file)
@@ -384,7 +384,7 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
                return ret;
 
        atomic_set(&ip->i_res->rs_sizehint,
-                  PAGE_CACHE_SIZE / sdp->sd_sb.sb_bsize);
+                  PAGE_CACHE_SIZE >> sdp->sd_sb.sb_bsize_shift);
 
        gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh);
        ret = gfs2_glock_nq(&gh);
@@ -669,7 +669,7 @@ static ssize_t gfs2_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
        if (ret)
                return ret;
 
-       atomic_set(&ip->i_res->rs_sizehint, writesize / sdp->sd_sb.sb_bsize);
+       atomic_set(&ip->i_res->rs_sizehint, writesize >> sdp->sd_sb.sb_bsize_shift);
        if (file->f_flags & O_APPEND) {
                struct gfs2_holder gh;
 
@@ -795,7 +795,7 @@ static long gfs2_fallocate(struct file *file, int mode, loff_t offset,
        if (unlikely(error))
                goto out_uninit;
 
-       atomic_set(&ip->i_res->rs_sizehint, len / sdp->sd_sb.sb_bsize);
+       atomic_set(&ip->i_res->rs_sizehint, len >> sdp->sd_sb.sb_bsize_shift);
 
        while (len > 0) {
                if (len < bytes)