gfs2: Fixup to "Get rid of flush_delayed_work in gfs2_evict_inode" (98e5a91a) · Commits · 戴 / test

When commit moved the call to flush_delayed_work from gfs2_evict_inode to gfs2_inode_lookup to avoid calling into DLM during evict, a similar call should have been added to gfs2_create_inode: that's another code path in which glocks of previous inodes may be reused. The flush of the iopen glock work queue added by , on the other hand, is unnecessary and can be removed. Signed-off-by:

Andreas Gruenbacher <agruenba@redhat.com> Signed-off-by:

Bob Peterson <rpeterso@redhat.com>

fs/gfs2/inode.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -174,7 +174,6 @@ struct inode gfs2_inode_lookup(struct super_block sb, unsigned int type,
		error = gfs2_glock_nq_init(io_gl, LM_ST_SHARED, GL_EXACT, &ip->i_iopen_gh);
		if (unlikely(error))
		goto fail_put;
		flush_delayed_work(&ip->i_iopen_gh.gh_gl->gl_work);
		glock_set_object(ip->i_iopen_gh.gh_gl, ip);
		gfs2_glock_put(io_gl);
		io_gl = NULL;
		@@ -706,8 +705,9 @@ static int gfs2_create_inode(struct inode dir, struct dentry dentry,
		error = gfs2_glock_get(sdp, ip->i_no_addr, &gfs2_inode_glops, CREATE, &ip->i_gl);
		if (error)
		goto fail_free_inode;

		flush_delayed_work(&ip->i_gl->gl_work);
		glock_set_object(ip->i_gl, ip);

		error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, GL_SKIP, ghs + 1);
		if (error)
		goto fail_free_inode;

Admin message