Commit 13587069 authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

gfs2: Stop using GFS2_BASIC_BLOCK and GFS2_BASIC_BLOCK_SHIFT 



Header gfs2_ondisk.h defines GFS2_BASIC_BLOCK and GFS2_BASIC_BLOCK_SHIFT
in a misguided attempt to abstract away the fact that sectors on block
devices are 512 or (1 << 9) bytes in size.  Stop using those definitions.

I would be inclinded to remove those definitions altogether, but the
gfs2 user-space tools are using them.

In addition, instead of GFS2_SB(inode)->sd_sb.sb_bsize_shift, simply use
inode->i_blkbits.

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
Cc: Andrew Price <anprice@redhat.com>
parent 2d8d7990

fs/gfs2/inode.h

+3 −5
Original line number Diff line number Diff line
@@ -44,19 +44,17 @@ static inline int gfs2_is_dir(const struct gfs2_inode *ip) 


static inline void gfs2_set_inode_blocks(struct inode *inode, u64 blocks)

{

	inode->i_blocks = blocks <<

		(GFS2_SB(inode)->sd_sb.sb_bsize_shift - GFS2_BASIC_BLOCK_SHIFT);

	inode->i_blocks = blocks << (inode->i_blkbits - 9);

}



static inline u64 gfs2_get_inode_blocks(const struct inode *inode)

{

	return inode->i_blocks >>

		(GFS2_SB(inode)->sd_sb.sb_bsize_shift - GFS2_BASIC_BLOCK_SHIFT);

	return inode->i_blocks >> (inode->i_blkbits - 9);

}



static inline void gfs2_add_inode_blocks(struct inode *inode, s64 change)

{

	change <<= inode->i_blkbits - GFS2_BASIC_BLOCK_SHIFT;

	change <<= inode->i_blkbits - 9;

	gfs2_assert(GFS2_SB(inode), (change >= 0 || inode->i_blocks >= -change));

	inode->i_blocks += change;

}

fs/gfs2/ops_fstype.c

+3 −5
Original line number Diff line number Diff line
@@ -292,8 +292,7 @@ static int gfs2_read_sb(struct gfs2_sbd *sdp, int silent) 
		return error;

	}



	sdp->sd_fsb2bb_shift = sdp->sd_sb.sb_bsize_shift -

			       GFS2_BASIC_BLOCK_SHIFT;

	sdp->sd_fsb2bb_shift = sdp->sd_sb.sb_bsize_shift - 9;

	sdp->sd_fsb2bb = BIT(sdp->sd_fsb2bb_shift);

	sdp->sd_diptrs = (sdp->sd_sb.sb_bsize -

			  sizeof(struct gfs2_dinode)) / sizeof(u64);
@@ -1190,10 +1189,9 @@ static int gfs2_fill_super(struct super_block *sb, struct fs_context *fc) 


	/* Set up the buffer cache and fill in some fake block size values

	   to allow us to read-in the on-disk superblock. */

	sdp->sd_sb.sb_bsize = sb_min_blocksize(sb, GFS2_BASIC_BLOCK);

	sdp->sd_sb.sb_bsize = sb_min_blocksize(sb, 512);

	sdp->sd_sb.sb_bsize_shift = sb->s_blocksize_bits;

	sdp->sd_fsb2bb_shift = sdp->sd_sb.sb_bsize_shift -

                               GFS2_BASIC_BLOCK_SHIFT;

	sdp->sd_fsb2bb_shift = sdp->sd_sb.sb_bsize_shift - 9;

	sdp->sd_fsb2bb = BIT(sdp->sd_fsb2bb_shift);



	sdp->sd_tune.gt_logd_secs = sdp->sd_args.ar_commit;