summaryrefslogtreecommitdiffstats
path: root/fs/gfs2/inode.c
diff options
context:
space:
mode:
authorBob Peterson <rpeterso@redhat.com>2015-12-07 15:10:42 -0600
committerBob Peterson <rpeterso@redhat.com>2015-12-18 10:49:22 -0600
commit86d067a797d4e8546a7c92b985f31e8cd3ec39ad (patch)
tree94599d8bd65f284a1c635510abafec51dc3131a3 /fs/gfs2/inode.c
parent400ac52e805bb6852e743817bc05a136e85042a9 (diff)
downloadop-kernel-dev-86d067a797d4e8546a7c92b985f31e8cd3ec39ad.zip
op-kernel-dev-86d067a797d4e8546a7c92b985f31e8cd3ec39ad.tar.gz
GFS2: Wait for iopen glock dequeues
This patch changes every glock_dq for iopen glocks into a dq_wait. This makes sure that iopen glocks do not outlive the inode itself. In turn, that ensures that anyone trying to unlink the glock will be able to find the inode when it receives a remote iopen callback. Signed-off-by: Bob Peterson <rpeterso@redhat.com> Acked-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/inode.c')
-rw-r--r--fs/gfs2/inode.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index a8ce2e9..bf2af04 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -191,7 +191,8 @@ struct inode *gfs2_inode_lookup(struct super_block *sb, unsigned int type,
fail_refresh:
ip->i_iopen_gh.gh_flags |= GL_NOCACHE;
ip->i_iopen_gh.gh_gl->gl_object = NULL;
- gfs2_glock_dq_uninit(&ip->i_iopen_gh);
+ gfs2_glock_dq_wait(&ip->i_iopen_gh);
+ gfs2_holder_uninit(&ip->i_iopen_gh);
fail_iopen:
if (io_gl)
gfs2_glock_put(io_gl);
OpenPOWER on IntegriCloud