[GFS2] Fix unlink deadlocks

Move the glock acquisition to outside of the transactions.

Lock odering must be preserved in order to prevent ABBA
deadlocks. The current gfs2_change_nlink code would tries
to grab the glock after having started a transaction and thus is holding
the log lock. This is inconsistent with other code paths in
gfs that grab the resource group glock prior to staring
a tranactions.

One problem with this fix is that the resource group
lock is always grabbed now even if the inode still has
ref count and can not be marked for unlink.

Signed-off-by: Russell Cattelan <cattelan@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

2 files changed, 40 insertions, 53 deletions

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 88fcfb4f5c4d..0d6831a40565 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -280,50 +280,6 @@ out:
         return error;
 }
 
-static int gfs2_change_nlink_i(struct gfs2_inode *ip)
-{
-        struct gfs2_sbd *sdp = ip->i_inode.i_sb->s_fs_info;
-        struct gfs2_inode *rindex = GFS2_I(sdp->sd_rindex);
-        struct gfs2_glock *ri_gl = rindex->i_gl;
-        struct gfs2_rgrpd *rgd;
-        struct gfs2_holder ri_gh, rg_gh;
-        int existing, error;
-
-        /* if we come from rename path, we could have the lock already */
-        existing = gfs2_glock_is_locked_by_me(ri_gl);
-        if (!existing) {
-                error = gfs2_rindex_hold(sdp, &ri_gh);
-                if (error)
-                        goto out;
-        }
-
-        /* find the matching rgd */
-        error = -EIO;
-        rgd = gfs2_blk2rgrpd(sdp, ip->i_num.no_addr);
-        if (!rgd)
-                goto out_norgrp;
-
-        /*
-         * Eventually we may want to move rgd(s) to a linked list
-         * and piggyback the free logic into one of gfs2 daemons
-         * to gain some performance.
-         */
-        if (!rgd->rd_gl || !gfs2_glock_is_locked_by_me(rgd->rd_gl)) {
-                error = gfs2_glock_nq_init(rgd->rd_gl, LM_ST_EXCLUSIVE, 0, &rg_gh);
-                if (error)
-                        goto out_norgrp;
-
-                gfs2_unlink_di(&ip->i_inode); /* mark inode unlinked */
-                gfs2_glock_dq_uninit(&rg_gh);
-        }
-
-out_norgrp:
-        if (!existing)
-                gfs2_glock_dq_uninit(&ri_gh);
-out:
-        return error;
-}
-
 /**
  * gfs2_change_nlink - Change nlink count on inode
  * @ip: The GFS2 inode
@@ -365,7 +321,7 @@ int gfs2_change_nlink(struct gfs2_inode *ip, int diff)
         mark_inode_dirty(&ip->i_inode);
 
         if (ip->i_inode.i_nlink == 0)
-                error = gfs2_change_nlink_i(ip);
+                gfs2_unlink_di(&ip->i_inode); /* mark inode unlinked */
 
         return error;
 }
diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c
index 5591f8905cf7..f40a84807d75 100644
--- a/fs/gfs2/ops_inode.c
+++ b/fs/gfs2/ops_inode.c
@@ -264,13 +264,23 @@ static int gfs2_unlink(struct inode *dir, struct dentry *dentry)
         struct gfs2_inode *dip = GFS2_I(dir);
         struct gfs2_sbd *sdp = GFS2_SB(dir);
         struct gfs2_inode *ip = GFS2_I(dentry->d_inode);
-        struct gfs2_holder ghs[2];
+        struct gfs2_holder ghs[3];
+        struct gfs2_rgrpd *rgd;
+        struct gfs2_holder ri_gh;
         int error;
 
+        error = gfs2_rindex_hold(sdp, &ri_gh);
+        if (error)
+                return error;
+
         gfs2_holder_init(dip->i_gl, LM_ST_EXCLUSIVE, 0, ghs);
-        gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, ghs + 1);
+        gfs2_holder_init(ip->i_gl,  LM_ST_EXCLUSIVE, 0, ghs + 1);
 
-        error = gfs2_glock_nq_m(2, ghs);
+        rgd = gfs2_blk2rgrpd(sdp, ip->i_num.no_addr);
+        gfs2_holder_init(rgd->rd_gl, LM_ST_EXCLUSIVE, 0, ghs + 2);
+
+
+        error = gfs2_glock_nq_m(3, ghs);
         if (error)
                 goto out;
 
@@ -291,10 +301,12 @@ static int gfs2_unlink(struct inode *dir, struct dentry *dentry)
 out_end_trans:
         gfs2_trans_end(sdp);
 out_gunlock:
-        gfs2_glock_dq_m(2, ghs);
+        gfs2_glock_dq_m(3, ghs);
 out:
         gfs2_holder_uninit(ghs);
         gfs2_holder_uninit(ghs + 1);
+        gfs2_holder_uninit(ghs + 2);
+        gfs2_glock_dq_uninit(&ri_gh);
         return error;
 }
 
@@ -449,13 +461,22 @@ static int gfs2_rmdir(struct inode *dir, struct dentry *dentry)
         struct gfs2_inode *dip = GFS2_I(dir);
         struct gfs2_sbd *sdp = GFS2_SB(dir);
         struct gfs2_inode *ip = GFS2_I(dentry->d_inode);
-        struct gfs2_holder ghs[2];
+        struct gfs2_holder ghs[3];
+        struct gfs2_rgrpd *rgd;
+        struct gfs2_holder ri_gh;
         int error;
 
+
+        error = gfs2_rindex_hold(sdp, &ri_gh);
+        if (error)
+                return error;
         gfs2_holder_init(dip->i_gl, LM_ST_EXCLUSIVE, 0, ghs);
         gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, ghs + 1);
 
-        error = gfs2_glock_nq_m(2, ghs);
+        rgd = gfs2_blk2rgrpd(sdp, ip->i_num.no_addr);
+        gfs2_holder_init(rgd->rd_gl, LM_ST_EXCLUSIVE, 0, ghs + 2);
+
+        error = gfs2_glock_nq_m(3, ghs);
         if (error)
                 goto out;
 
@@ -483,10 +504,12 @@ static int gfs2_rmdir(struct inode *dir, struct dentry *dentry)
         gfs2_trans_end(sdp);
 
 out_gunlock:
-        gfs2_glock_dq_m(2, ghs);
+        gfs2_glock_dq_m(3, ghs);
 out:
         gfs2_holder_uninit(ghs);
         gfs2_holder_uninit(ghs + 1);
+        gfs2_holder_uninit(ghs + 2);
+        gfs2_glock_dq_uninit(&ri_gh);
         return error;
 }
 
@@ -547,7 +570,8 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
         struct gfs2_inode *ip = GFS2_I(odentry->d_inode);
         struct gfs2_inode *nip = NULL;
         struct gfs2_sbd *sdp = GFS2_SB(odir);
-        struct gfs2_holder ghs[4], r_gh;
+        struct gfs2_holder ghs[5], r_gh;
+        struct gfs2_rgrpd *nrgd;
         unsigned int num_gh;
         int dir_rename = 0;
         int alloc_required;
@@ -587,6 +611,13 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
         if (nip) {
                 gfs2_holder_init(nip->i_gl, LM_ST_EXCLUSIVE, 0, ghs + num_gh);
                 num_gh++;
+                /* grab the resource lock for unlink flag twiddling 
+                 * this is the case of the target file already existing
+                 * so we unlink before doing the rename
+                 */
+                nrgd = gfs2_blk2rgrpd(sdp, nip->i_num.no_addr);
+                if (nrgd)
+                        gfs2_holder_init(nrgd->rd_gl, LM_ST_EXCLUSIVE, 0, ghs + num_gh++);
         }
 
         error = gfs2_glock_nq_m(num_gh, ghs);