diff options
| author | Steven Whitehouse | 2010-08-11 10:53:11 +0200 |
|---|---|---|
| committer | Steven Whitehouse | 2010-09-20 12:18:29 +0200 |
| commit | a2e0f79939e09e74698564b88dee709db208e1e2 (patch) | |
| tree | 0018e445e3d47c4558901153733899ef672f789e /fs/gfs2/super.c | |
| parent | GFS2: New truncate sequence (diff) | |
| download | kernel-qcow2-linux-a2e0f79939e09e74698564b88dee709db208e1e2.tar.gz kernel-qcow2-linux-a2e0f79939e09e74698564b88dee709db208e1e2.tar.xz kernel-qcow2-linux-a2e0f79939e09e74698564b88dee709db208e1e2.zip | |
GFS2: Remove i_disksize
With the update of the truncate code, ip->i_disksize and
inode->i_size are merely copies of each other. This means
we can remove ip->i_disksize and use inode->i_size exclusively
reducing the size of a GFS2 inode by 8 bytes.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/super.c')
| -rw-r--r-- | fs/gfs2/super.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index 77cb9f830ee4..e031fa4965a3 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c @@ -342,15 +342,14 @@ int gfs2_jdesc_check(struct gfs2_jdesc *jd) { struct gfs2_inode *ip = GFS2_I(jd->jd_inode); struct gfs2_sbd *sdp = GFS2_SB(jd->jd_inode); + u64 size = i_size_read(jd->jd_inode); - if (ip->i_disksize < (8 << 20) || ip->i_disksize > (1 << 30) || - (ip->i_disksize & (sdp->sd_sb.sb_bsize - 1))) { - gfs2_consist_inode(ip); + if (gfs2_check_internal_file_size(jd->jd_inode, 8 << 20, 1 << 30)) return -EIO; - } - jd->jd_blocks = ip->i_disksize >> sdp->sd_sb.sb_bsize_shift; - if (gfs2_write_alloc_required(ip, 0, ip->i_disksize)) { + jd->jd_blocks = size >> sdp->sd_sb.sb_bsize_shift; + + if (gfs2_write_alloc_required(ip, 0, size)) { gfs2_consist_inode(ip); return -EIO; } |