Commit 2d084780 authored by Andrew Price's avatar Andrew Price Committed by Andreas Gruenbacher

gfs2: Remove ghs[] from gfs2_link

Replace the 2-item array with two variables for readability.
Signed-off-by: default avatarAndrew Price <anprice@redhat.com>
Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent 8dc14966
...@@ -941,7 +941,7 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir, ...@@ -941,7 +941,7 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir,
struct gfs2_sbd *sdp = GFS2_SB(dir); struct gfs2_sbd *sdp = GFS2_SB(dir);
struct inode *inode = d_inode(old_dentry); struct inode *inode = d_inode(old_dentry);
struct gfs2_inode *ip = GFS2_I(inode); struct gfs2_inode *ip = GFS2_I(inode);
struct gfs2_holder ghs[2]; struct gfs2_holder d_gh, gh;
struct buffer_head *dibh; struct buffer_head *dibh;
struct gfs2_diradd da = { .bh = NULL, .save_loc = 1, }; struct gfs2_diradd da = { .bh = NULL, .save_loc = 1, };
int error; int error;
...@@ -953,14 +953,14 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir, ...@@ -953,14 +953,14 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir,
if (error) if (error)
return error; return error;
gfs2_holder_init(dip->i_gl, LM_ST_EXCLUSIVE, 0, ghs); gfs2_holder_init(dip->i_gl, LM_ST_EXCLUSIVE, 0, &d_gh);
gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, 0, ghs + 1); 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) if (error)
goto out_parent; goto out_parent;
error = gfs2_glock_nq(ghs + 1); /* child */ error = gfs2_glock_nq(&gh);
if (error) if (error)
goto out_child; goto out_child;
...@@ -1046,13 +1046,13 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir, ...@@ -1046,13 +1046,13 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir,
gfs2_quota_unlock(dip); gfs2_quota_unlock(dip);
out_gunlock: out_gunlock:
gfs2_dir_no_add(&da); gfs2_dir_no_add(&da);
gfs2_glock_dq(ghs + 1); gfs2_glock_dq(&gh);
out_child: out_child:
gfs2_glock_dq(ghs); gfs2_glock_dq(&d_gh);
out_parent: out_parent:
gfs2_qa_put(dip); gfs2_qa_put(dip);
gfs2_holder_uninit(ghs); gfs2_holder_uninit(&d_gh);
gfs2_holder_uninit(ghs + 1); gfs2_holder_uninit(&gh);
return error; return error;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment