Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40ac218f authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

GFS2: Fix inode allocation error path 



If we have got far enough through the inode allocation code
path that an inode has already been allocated, then we must
call iput to dispose of it, if an error occurs during a
later part of the process. This will always be the final iput
since there will be no other references to the inode.

Unlike when the inode has been unlinked, its block state will
be GFS2_BLKST_INODE rather than GFS2_BLKST_UNLINKED so we need
to skip the test in ->evict_inode() for this one case in order
to ensure that it will be deallocated correctly. This patch adds
a new flag in order to ensure that this will happen correctly.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 1d4ec642

fs/gfs2/incore.h

+1 −0
Original line number Diff line number Diff line
@@ -267,6 +267,7 @@ struct gfs2_alloc { 
enum {

	GIF_INVALID		= 0,

	GIF_QD_LOCKED		= 1,

	GIF_ALLOC_FAILED	= 2,

	GIF_SW_PAGED		= 3,

};

fs/gfs2/inode.c

+4 −2
Original line number Diff line number Diff line
@@ -736,10 +736,12 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry, 


fail_gunlock2:

	gfs2_glock_dq_uninit(ghs + 1);

	if (inode && !IS_ERR(inode))

		iput(inode);

fail_gunlock:

	gfs2_glock_dq_uninit(ghs);

	if (inode && !IS_ERR(inode)) {

		set_bit(GIF_ALLOC_FAILED, &GFS2_I(inode)->i_flags);

		iput(inode);

	}

fail:

	if (bh)

		brelse(bh);

fs/gfs2/super.c

+9 −3
Original line number Diff line number Diff line
@@ -1471,9 +1471,11 @@ static void gfs2_evict_inode(struct inode *inode) 
		goto out;

	}



	if (!test_bit(GIF_ALLOC_FAILED, &ip->i_flags)) {

		error = gfs2_check_blk_type(sdp, ip->i_no_addr, GFS2_BLKST_UNLINKED);

		if (error)

			goto out_truncate;

	}



	if (test_bit(GIF_INVALID, &ip->i_flags)) {

		error = gfs2_inode_refresh(ip);
@@ -1513,6 +1515,10 @@ static void gfs2_evict_inode(struct inode *inode) 
	goto out_unlock;



out_truncate:

	gfs2_log_flush(sdp, ip->i_gl);

	write_inode_now(inode, 1);

	gfs2_ail_flush(ip->i_gl);



	/* Case 2 starts here */

	error = gfs2_trans_begin(sdp, 0, sdp->sd_jdesc->jd_blocks);

	if (error)