GFS2: Release iopen glock in gfs2_create_inode error cases
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 GFS2: Release iopen glock in gfs2_create_inode error cases
Hi,
Some error cases in gfs2_create_inode were not unlocking the iopen glock, getting the reference count off. This adds the proper unlock. The error logic in function gfs2_create_inode was also convoluted, so this patch simplifies it. It also takes care of a bug in which gfs2_qa_delete() was not called in an error case.
Regards,
Bob Peterson
Red Hat File Systems
Signed-off-by Bob Peterson <[email protected]>
---
fs/gfs2/inode.c +7 -9
@@ -593,7 +593,7 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,struct gfs2_inode *dip =GFS2_I (dir), *ip;struct gfs2_sbd *sdp =GFS2_SB (&dip->i_inode);struct gfs2_glock *io_gl; -int error, free_vfs_inode =0 ; +int error, free_vfs_inode =1 ;u32 aflags =0 ;unsigned blocks =1 ;struct gfs2_diradd da = { .bh =NULL , .save_loc =1 , };
@@ -650,7 +650,7 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry, error =posix_acl_create (dir, &mode, &default_acl, &acl);if (error) - goto fail_free_vfs_inode; + goto fail_gunlock; ip =GFS2_I (inode); error =gfs2_rsqa_alloc (ip);
@@ -738,6 +738,9 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,gfs2_set_iop (inode);insert_inode_hash (inode); + free_vfs_inode =0 ;/* After this point, the inode is no longer +considered free. Any failures need to undo +the gfs2 structures. */ if (default_acl) { error =gfs2_set_acl (inode, default_acl,ACL_TYPE_DEFAULT );posix_acl_release (default_acl);
@@ -771,11 +774,8 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,return error; fail_gunlock3: -gfs2_glock_dq_uninit (ghs +1 ); -if (ip->i_gl) -gfs2_glock_put (ip->i_gl); - goto fail_gunlock; - +gfs2_glock_dq_uninit (&ip->i_iopen_gh); +gfs2_glock_put (io_gl); fail_gunlock2:gfs2_glock_dq_uninit (ghs +1 ); fail_free_inode:
@@ -787,8 +787,6 @@ fail_free_acls:posix_acl_release (default_acl);if (acl)posix_acl_release (acl); -fail_free_vfs_inode: - free_vfs_inode =1 ; fail_gunlock:gfs2_dir_no_add (&da);gfs2_glock_dq_uninit (ghs);