From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bob Peterson Date: Wed, 13 Nov 2019 15:30:27 -0600 Subject: [Cluster-devel] [PATCH 29/32] gfs2: if finish_open returns error, clean up iopen glock mess In-Reply-To: <20191113213030.237431-1-rpeterso@redhat.com> References: <20191113213030.237431-1-rpeterso@redhat.com> Message-ID: <20191113213030.237431-30-rpeterso@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Before this patch, if anything went wrong in function gfs2_create_inode it would goto fail_gunlock3 and clean up the iopen glock it had just created and locked. However, if function finish_open returns an error it did not. That meant subsequent attempts to create the file were seen as glock recursion errors on the iopen glock. This patch adds additional checking for an error from finish_open and cleans up the iopen glock appropriately. Signed-off-by: Bob Peterson --- fs/gfs2/inode.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index dcb5d363f9b9..acfc57e1cb53 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -772,6 +772,12 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry, gfs2_glock_dq_uninit(ghs); gfs2_glock_dq_uninit(ghs + 1); clear_bit(GLF_INODE_CREATING, &io_gl->gl_flags); + if (error) { + glock_clear_object(io_gl, ip); + clear_bit(GLF_INODE_CREATING, &io_gl->gl_flags); + gfs2_glock_dq_uninit(&ip->i_iopen_gh); + gfs2_glock_put(io_gl); + } return error; fail_gunlock3: -- 2.23.0