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

Commit 718b97bd authored by Bob Peterson's avatar Bob Peterson Committed by Steven Whitehouse
Browse files

GFS2: Read in rindex if necessary during unlink 



This patch fixes a problem whereby you were unable to delete
files until other file system operations were done (such as
statfs, touch, writes, etc.) that caused the rindex to be
read in.

Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 4043b886

fs/gfs2/inode.c

+7 −2
Original line number Diff line number Diff line
@@ -1035,14 +1035,19 @@ static int gfs2_unlink(struct inode *dir, struct dentry *dentry) 
	struct buffer_head *bh;

	struct gfs2_holder ghs[3];

	struct gfs2_rgrpd *rgd;

	int error = -EROFS;

	int error;



	error = gfs2_rindex_update(sdp);

	if (error)

		return error;

	gfs2_holder_init(dip->i_gl, LM_ST_EXCLUSIVE, 0, ghs);

	gfs2_holder_init(ip->i_gl,  LM_ST_EXCLUSIVE, 0, ghs + 1);



	rgd = gfs2_blk2rgrpd(sdp, ip->i_no_addr);

	if (!rgd)

	if (!rgd) {

		error = -EROFS;

		goto out_inodes;

	}

	gfs2_holder_init(rgd->rd_gl, LM_ST_EXCLUSIVE, 0, ghs + 2);