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

Commit 1e19a195 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

GFS2: Don't try and dealloc own inode 



When searching for unlinked, but still allocated inodes during block
allocation, avoid the block relating to the inode that is doing the
allocation. This fixes a hang caused when an unlinked, but still
open, inode tries to allocate some more blocks and lands up
finding itself during the search for deallocatable inodes.

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

fs/gfs2/rgrp.c

+6 −3
Original line number Diff line number Diff line
@@ -961,7 +961,8 @@ static int try_rgrp_fit(struct gfs2_rgrpd *rgd, struct gfs2_alloc *al) 
 * Returns: The inode, if one has been found

 */



static struct inode *try_rgrp_unlink(struct gfs2_rgrpd *rgd, u64 *last_unlinked)

static struct inode *try_rgrp_unlink(struct gfs2_rgrpd *rgd, u64 *last_unlinked,

				     u64 skip)

{

	struct inode *inode;

	u32 goal = 0, block;
@@ -985,6 +986,8 @@ static struct inode *try_rgrp_unlink(struct gfs2_rgrpd *rgd, u64 *last_unlinked) 
		goal++;

		if (*last_unlinked != NO_BLOCK && no_addr <= *last_unlinked)

			continue;

		if (no_addr == skip)

			continue;

		*last_unlinked = no_addr;

		inode = gfs2_inode_lookup(rgd->rd_sbd->sd_vfs, DT_UNKNOWN,

					  no_addr, -1, 1);
@@ -1104,7 +1107,7 @@ static struct inode *get_local_rgrp(struct gfs2_inode *ip, u64 *last_unlinked) 
			if (try_rgrp_fit(rgd, al))

				goto out;

			if (rgd->rd_flags & GFS2_RDF_CHECK)

				inode = try_rgrp_unlink(rgd, last_unlinked);

				inode = try_rgrp_unlink(rgd, last_unlinked, ip->i_no_addr);

			if (!rg_locked)

				gfs2_glock_dq_uninit(&al->al_rgd_gh);

			if (inode)
@@ -1138,7 +1141,7 @@ static struct inode *get_local_rgrp(struct gfs2_inode *ip, u64 *last_unlinked) 
			if (try_rgrp_fit(rgd, al))

				goto out;

			if (rgd->rd_flags & GFS2_RDF_CHECK)

				inode = try_rgrp_unlink(rgd, last_unlinked);

				inode = try_rgrp_unlink(rgd, last_unlinked, ip->i_no_addr);

			if (!rg_locked)

				gfs2_glock_dq_uninit(&al->al_rgd_gh);

			if (inode)