diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2008-11-04 04:47:33 -0500 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2009-01-05 02:38:58 -0500 |
commit | c9e98886776386f1f7828d9685e78cd341849867 (patch) | |
tree | 5bf4ac819d1e9394f960f21a48881a9d2f9f69fe /fs/gfs2/super.c | |
parent | 3767ac21f471fe669a7d9f6abef682ddac8fc3d8 (diff) |
GFS2: Move i_size from gfs2_dinode_host and rename it to i_disksize
This patch moved the i_size field from the gfs2_dinode_host and
following the ext3 convention renames it i_disksize.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/super.c')
-rw-r--r-- | fs/gfs2/super.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index c3ba3d9d0aac..f5cef2ad7ae1 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c | |||
@@ -206,14 +206,14 @@ int gfs2_jdesc_check(struct gfs2_jdesc *jd) | |||
206 | int ar; | 206 | int ar; |
207 | int error; | 207 | int error; |
208 | 208 | ||
209 | if (ip->i_di.di_size < (8 << 20) || ip->i_di.di_size > (1 << 30) || | 209 | if (ip->i_disksize < (8 << 20) || ip->i_disksize > (1 << 30) || |
210 | (ip->i_di.di_size & (sdp->sd_sb.sb_bsize - 1))) { | 210 | (ip->i_disksize & (sdp->sd_sb.sb_bsize - 1))) { |
211 | gfs2_consist_inode(ip); | 211 | gfs2_consist_inode(ip); |
212 | return -EIO; | 212 | return -EIO; |
213 | } | 213 | } |
214 | jd->jd_blocks = ip->i_di.di_size >> sdp->sd_sb.sb_bsize_shift; | 214 | jd->jd_blocks = ip->i_disksize >> sdp->sd_sb.sb_bsize_shift; |
215 | 215 | ||
216 | error = gfs2_write_alloc_required(ip, 0, ip->i_di.di_size, &ar); | 216 | error = gfs2_write_alloc_required(ip, 0, ip->i_disksize, &ar); |
217 | if (!error && ar) { | 217 | if (!error && ar) { |
218 | gfs2_consist_inode(ip); | 218 | gfs2_consist_inode(ip); |
219 | error = -EIO; | 219 | error = -EIO; |