GFS2: Add a bug trap in allocation code (9a3f236d) · Commits · 戴 / test

This adds a check to ensure that if we reach the block allocator that we don't try and proceed if there is no alloc structure hanging off the inode. This should only happen if there is a bug in GFS2. The error return code is distinctive in order that it will be easily spotted. Signed-off-by:

Steven Whitehouse <swhiteho@redhat.com>

fs/gfs2/rgrp.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -1496,11 +1496,19 @@ int gfs2_alloc_block(struct gfs2_inode ip, u64 bn, unsigned int *n)
		struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
		struct buffer_head *dibh;
		struct gfs2_alloc *al = ip->i_alloc;
		struct gfs2_rgrpd *rgd = al->al_rgd;
		struct gfs2_rgrpd *rgd;
		u32 goal, blk;
		u64 block;
		int error;

		/* Only happens if there is a bug in gfs2, return something distinctive
		* to ensure that it is noticed.
		*/
		if (al == NULL)
		return -ECANCELED;

		rgd = al->al_rgd;

		if (rgrp_contains_block(rgd, ip->i_goal))
		goal = ip->i_goal - rgd->rd_data0;
		else

Admin message