Fix glock ordering on inode creation [54/70]
From 28626e2078571c4b776a17eaa486bbd2b7dfe2cd Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <[email protected]>
Date: Wed, 22 Nov 2006 11:13:21 -0500
Subject: [PATCH] [GFS2] Fix glock ordering on inode creation
The lock order here should be parent -> child rather than numeric order.
Signed-off-by Steven Whitehouse <[email protected]>
--- fs/gfs2/inode.c | 31 ++++--------------------------- 1 files changed, 4 insertions(+), 27 deletions(-)
fs/gfs2/inode.c +4 -27
@@ -870,33 +870,10 @@ struct inode *gfs2_createi(struct gfs2_hif (error) goto fail_gunlock; -if (inum.no_addr < dip->i_num.no_addr) { -gfs2_glock_dq (ghs); - - error =gfs2_glock_nq_num (sdp, inum.no_addr, - &gfs2_inode_glops,LM_ST_EXCLUSIVE , -GL_SKIP , ghs +1 ); -if (error) { -return ERR_PTR (error); - } - -gfs2_holder_reinit (LM_ST_EXCLUSIVE ,0 , ghs); - error =gfs2_glock_nq (ghs); -if (error) { -gfs2_glock_dq_uninit (ghs +1 ); -return ERR_PTR (error); - } - - error =create_ok (dip, name, mode); -if (error) - goto fail_gunlock2; - }else { - error =gfs2_glock_nq_num (sdp, inum.no_addr, - &gfs2_inode_glops,LM_ST_EXCLUSIVE , -GL_SKIP , ghs +1 ); -if (error) - goto fail_gunlock; - } + error =gfs2_glock_nq_num (sdp, inum.no_addr, &gfs2_inode_glops, +LM_ST_EXCLUSIVE ,GL_SKIP , ghs +1 ); +if (error) + goto fail_gunlock; error =make_dinode (dip, ghs[1 ].gh_gl, mode, &inum, &generation, dev);if (error)
Signature · 1 line
1.4.1