gfs2: Remove ghs[] from gfs2_link

Replace the 2-item array with two variables for readability.

Signed-off-by: Andrew Price <anprice@redhat.com>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index 79eef9a0ebfc592e5b019f45f1903874ca1b571a..9850267b9951a77482e8c73ac258b9a69889a2e6 100644 (file)
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -941,7 +941,7 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir,
        struct gfs2_sbd *sdp = GFS2_SB(dir);
        struct inode *inode = d_inode(old_dentry);
        struct gfs2_inode *ip = GFS2_I(inode);
-       struct gfs2_holder ghs[2];
+       struct gfs2_holder d_gh, gh;
        struct buffer_head *dibh;
        struct gfs2_diradd da = { .bh = NULL, .save_loc = 1, };
        int error;
@@ -953,14 +953,14 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir,
        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(dip->i_gl, LM_ST_EXCLUSIVE, 0, &d_gh);
+       gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, &gh);
 
-       error = gfs2_glock_nq(ghs); /* parent */
+       error = gfs2_glock_nq(&d_gh);
        if (error)
                goto out_parent;
 
-       error = gfs2_glock_nq(ghs + 1); /* child */
+       error = gfs2_glock_nq(&gh);
        if (error)
                goto out_child;
 
@@ -1046,13 +1046,13 @@ out_gunlock_q:
                gfs2_quota_unlock(dip);
 out_gunlock:
        gfs2_dir_no_add(&da);
-       gfs2_glock_dq(ghs + 1);
+       gfs2_glock_dq(&gh);
 out_child:
-       gfs2_glock_dq(ghs);
+       gfs2_glock_dq(&d_gh);
 out_parent:
        gfs2_qa_put(dip);
-       gfs2_holder_uninit(ghs);
-       gfs2_holder_uninit(ghs + 1);
+       gfs2_holder_uninit(&d_gh);
+       gfs2_holder_uninit(&gh);
        return error;
 }