[Cluster-devel] [PATCH] gfs2: Fixup to "Get rid of flush_delayed_work in gfs2_evict_inode"

[Cluster-devel] [PATCH] gfs2: Fixup to "Get rid of flush_delayed_work in gfs2_evict_inode"

[Andreas Gruenbacher]

When commit 4fd1a57952 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 4fd1a57952, on the
other hand, is unnecessary and can be removed.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
---
 fs/gfs2/inode.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index acca501..f9302f1 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -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;
-- 
2.7.5

[Cluster-devel] [PATCH] gfs2: Fixup to "Get rid of flush_delayed_work in gfs2_evict_inode"

[Bob Peterson]

----- Original Message -----
| When commit 4fd1a57952 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 4fd1a57952, on the
| other hand, is unnecessary and can be removed.
| 
| Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>

Hi,

Thanks. This is now applied to the for-next branch of the linux-gfs2 tree:
https://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git/commit/fs/gfs2?h=for-next&id=98e5a91a6136af01198cfe9a3499f090718fd6ff

Regards,

Bob Peterson
Red Hat File Systems