Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e1cc86037b689a82cdb2df50c32fa8cf9d6b6c3a
Commit:     e1cc86037b689a82cdb2df50c32fa8cf9d6b6c3a
Parent:     ffed8ab342e39b8b5f4d5c94c37a708e225ffcd8
Author:     Steven Whitehouse <[EMAIL PROTECTED]>
AuthorDate: Thu Jun 7 11:47:52 2007 +0100
Committer:  Steven Whitehouse <[EMAIL PROTECTED]>
CommitDate: Mon Jul 9 08:23:22 2007 +0100

    [GFS2] Fix bug in error path of inode
    
    This fixes a bug in the ordering of operations in the error path of
    createi. Its not valid to do an iput() when holding the inode's glock
    since the iput() will (in this case) result in delete_inode() being
    called which needs to grab the lock itself. This was causing the
    recursive lock checking code to trigger.
    
    Signed-off-by: Steven Whitehouse <[EMAIL PROTECTED]>
---
 fs/gfs2/inode.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 3ef0f05..87505f7 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -857,7 +857,7 @@ static int gfs2_security_init(struct gfs2_inode *dip, 
struct gfs2_inode *ip)
 struct inode *gfs2_createi(struct gfs2_holder *ghs, const struct qstr *name,
                           unsigned int mode, dev_t dev)
 {
-       struct inode *inode;
+       struct inode *inode = NULL;
        struct gfs2_inode *dip = ghs->gh_gl->gl_object;
        struct inode *dir = &dip->i_inode;
        struct gfs2_sbd *sdp = GFS2_SB(&dip->i_inode);
@@ -900,28 +900,28 @@ struct inode *gfs2_createi(struct gfs2_holder *ghs, const 
struct qstr *name,
 
        error = gfs2_inode_refresh(GFS2_I(inode));
        if (error)
-               goto fail_iput;
+               goto fail_gunlock2;
 
        error = gfs2_acl_create(dip, GFS2_I(inode));
        if (error)
-               goto fail_iput;
+               goto fail_gunlock2;
 
        error = gfs2_security_init(dip, GFS2_I(inode));
        if (error)
-               goto fail_iput;
+               goto fail_gunlock2;
 
        error = link_dinode(dip, name, GFS2_I(inode));
        if (error)
-               goto fail_iput;
+               goto fail_gunlock2;
 
        if (!inode)
                return ERR_PTR(-ENOMEM);
        return inode;
 
-fail_iput:
-       iput(inode);
 fail_gunlock2:
        gfs2_glock_dq_uninit(ghs + 1);
+       if (inode)
+               iput(inode);
 fail_gunlock:
        gfs2_glock_dq(ghs);
 fail:
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to