[GFS2] Fix write alloc required shortcut calculation
authorSteven Whitehouse <swhiteho@redhat.com>
Wed, 16 Jan 2008 14:24:05 +0000 (14:24 +0000)
committerSteven Whitehouse <swhiteho@redhat.com>
Fri, 25 Jan 2008 08:19:28 +0000 (08:19 +0000)
The comparison was being made against the wrong quantity.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
fs/gfs2/bmap.c

index 4356cc2fb3f5cca827a4b290c1e6871e8fe44bbe..e4effc47abfc865f82f71b6855f06521253c25b5 100644 (file)
@@ -1222,10 +1222,10 @@ int gfs2_write_alloc_required(struct gfs2_inode *ip, u64 offset,
                do_div(lblock_stop, bsize);
        } else {
                unsigned int shift = sdp->sd_sb.sb_bsize_shift;
+               u64 end_of_file = (ip->i_di.di_size + sdp->sd_sb.sb_bsize - 1) >> shift;
                lblock = offset >> shift;
                lblock_stop = (offset + len + sdp->sd_sb.sb_bsize - 1) >> shift;
-               if (lblock_stop > ip->i_di.di_blocks) { /* writing past the
-                                                          last block */
+               if (lblock_stop > end_of_file) {
                        *alloc_required = 1;
                        return 0;
                }