diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2008-01-16 14:24:05 +0000 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2008-01-25 08:19:28 +0000 |
| commit | 1af535727bbf68e1da7ac232de47315da4c66ade (patch) | |
| tree | ab24a9bc1271179fdae558d4f66e7ee0e401ce4c /fs | |
| parent | 05220535196d413db434527a3edcba79b7187df8 (diff) | |
| download | linux-3.10-1af535727bbf68e1da7ac232de47315da4c66ade.tar.gz linux-3.10-1af535727bbf68e1da7ac232de47315da4c66ade.tar.bz2 linux-3.10-1af535727bbf68e1da7ac232de47315da4c66ade.zip | |
[GFS2] Fix write alloc required shortcut calculation
The comparison was being made against the wrong quantity.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/gfs2/bmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c index 4356cc2fb3f..e4effc47abf 100644 --- a/fs/gfs2/bmap.c +++ b/fs/gfs2/bmap.c @@ -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; } |