]> asedeno.scripts.mit.edu Git - linux.git/commit
gfs2: Remove sdp->sd_jheightsize
authorAndreas Gruenbacher <agruenba@redhat.com>
Mon, 16 Apr 2018 16:25:21 +0000 (09:25 -0700)
committerBob Peterson <rpeterso@redhat.com>
Mon, 16 Apr 2018 16:25:21 +0000 (09:25 -0700)
commit9a38662ba4e2682f3f3e9f3ce02a243b837aa8c6
tree04e48c2048033df4b4ba399fd922405c9bb1ac6c
parent16e205cf42da1f497b10a4a24f563e6c0d574eec
gfs2: Remove sdp->sd_jheightsize

GFS2 keeps two arrarys in the superblock that define the maximum size of
an inode depending on the inode's height: sdp->sd_heightsize defines the
heights in units of sb->s_blocksize; sdp->sd_jheightsize defines them in
units of sb->s_blocksize - sizeof(struct gfs2_meta_header).  These
arrays are used to determine when additional layers of indirect blocks
are needed.  The second array is used for directories which have an
additional gfs2_meta_header at the beginning of each block.

Distinguishing between these two cases makes no sense: the height
required for representing N blocks will come out the same no matter if
the calculation is done in gross (sb->s_blocksize) or net
(sb->s_blocksize - sizeof(struct gfs2_meta_header)) units.

Stuffed directories don't have an additional gfs2_meta_header, but the
stuffed case is handled separately for both files and directories,
anyway.

Remove the unncessary sdp->sd_jheightsize array.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
fs/gfs2/bmap.c
fs/gfs2/incore.h
fs/gfs2/ops_fstype.c