GFS2: fix bad inode i_goal values during block allocation (00a158be) · Commits · 戴 / test

This patch checks if i_goal is either zero or if doesn't exist within any rgrp (i.e gfs2_blk2rgrpd() returns NULL). If so, it assigns the ip->i_no_addr block as the i_goal. There are two scenarios where a bad i_goal can result in a -EBADSLT error. 1. Attempting to allocate to an existing inode: Control reaches gfs2_inplace_reserve() and ip->i_goal is bad. We need to fix i_goal here. 2. A new inode is created in a directory whose i_goal is hosed: In this case, the parent dir's i_goal is copied onto the new inode. Since the new inode is not yet created, the ip->i_no_addr field is invalid and so, the fix in gfs2_inplace_reserve() as per 1) won't work in this scenario. We need to catch and fix it sooner in the parent dir itself (gfs2_create_inode()), before it is copied to the new inode. Signed-off-by:

Abhi Das <adas@redhat.com> Signed-off-by:

Steven Whitehouse <swhiteho@redhat.com>

fs/gfs2/inode.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -672,6 +672,7 @@ static int gfs2_create_inode(struct inode dir, struct dentry dentry,
		inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
		gfs2_set_inode_blocks(inode, 1);
		munge_mode_uid_gid(dip, inode);
		check_and_update_goal(dip);
		ip->i_goal = dip->i_goal;
		ip->i_diskflags = 0;
		ip->i_eattr = 0;

fs/gfs2/rgrp.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -577,6 +577,13 @@ struct gfs2_rgrpd gfs2_rgrpd_get_next(struct gfs2_rgrpd rgd)
		return rgd;
		}

		void check_and_update_goal(struct gfs2_inode *ip)
		{
		struct gfs2_sbd *sdp = GFS2_SB(&ip->i_inode);
		if (!ip->i_goal \|\| gfs2_blk2rgrpd(sdp, ip->i_goal, 1) == NULL)
		ip->i_goal = ip->i_no_addr;
		}

		void gfs2_free_clones(struct gfs2_rgrpd *rgd)
		{
		int x;
		@@ -1910,6 +1917,7 @@ int gfs2_inplace_reserve(struct gfs2_inode ip, const struct gfs2_alloc_parms a
		} else if (ip->i_rgd && rgrp_contains_block(ip->i_rgd, ip->i_goal)) {
		rs->rs_rbm.rgd = begin = ip->i_rgd;
		} else {
		check_and_update_goal(ip);
		rs->rs_rbm.rgd = begin = gfs2_blk2rgrpd(sdp, ip->i_goal, 1);
		}
		if (S_ISDIR(ip->i_inode.i_mode) && (ap->aflags & GFS2_AF_ORLOV))

fs/gfs2/rgrp.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -80,4 +80,5 @@ static inline bool gfs2_rs_active(struct gfs2_blkreserv *rs)
		return rs && !RB_EMPTY_NODE(&rs->rs_node);
		}

		extern void check_and_update_goal(struct gfs2_inode *ip);
		#endif /* __RGRP_DOT_H__ */

Admin message