From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bob Peterson Date: Tue, 6 Oct 2015 14:02:46 -0500 Subject: [Cluster-devel] [GFS2 PATCH v2 13/15] gfs2: Use new variable i_gl instead of ip->i_gl In-Reply-To: <1444158168-23036-1-git-send-email-rpeterso@redhat.com> References: <1444158168-23036-1-git-send-email-rpeterso@redhat.com> Message-ID: <1444158168-23036-14-git-send-email-rpeterso@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit This patch adds a new variable to function gfs2_evict_inode that simplifies the references to ip->i_gl. This is just for readability and to clarify future patches. Signed-off-by: Bob Peterson --- fs/gfs2/super.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index 06bd72b..cd70ea2 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c @@ -1511,6 +1511,7 @@ static void gfs2_evict_inode(struct inode *inode) struct gfs2_sbd *sdp = sb->s_fs_info; struct gfs2_inode *ip = GFS2_I(inode); struct gfs2_holder gh; + struct gfs2_glock *i_gl = ip->i_gl; struct address_space *metamapping; int error; @@ -1523,7 +1524,7 @@ static void gfs2_evict_inode(struct inode *inode) goto out; /* Must not read inode block until block type has been verified */ - error = gfs2_glock_nq_init(ip->i_gl, LM_ST_EXCLUSIVE, GL_SKIP, &gh); + error = gfs2_glock_nq_init(i_gl, LM_ST_EXCLUSIVE, GL_SKIP, &gh); if (unlikely(error)) { ip->i_iopen_gh.gh_flags |= GL_NOCACHE; gfs2_glock_dq_wait(&ip->i_iopen_gh); @@ -1575,14 +1576,14 @@ static void gfs2_evict_inode(struct inode *inode) goto out_unlock; out_truncate: - gfs2_log_flush(sdp, ip->i_gl, NORMAL_FLUSH); - metamapping = gfs2_glock2aspace(ip->i_gl); - if (test_bit(GLF_DIRTY, &ip->i_gl->gl_flags)) { + gfs2_log_flush(sdp, i_gl, NORMAL_FLUSH); + metamapping = gfs2_glock2aspace(i_gl); + if (test_bit(GLF_DIRTY, &i_gl->gl_flags)) { filemap_fdatawrite(metamapping); filemap_fdatawait(metamapping); } write_inode_now(inode, 1); - gfs2_ail_flush(ip->i_gl, 0); + gfs2_ail_flush(i_gl, 0); /* Case 2 starts here */ error = gfs2_trans_begin(sdp, 0, sdp->sd_jdesc->jd_blocks); @@ -1616,7 +1617,7 @@ out: ip->i_gl->gl_object = NULL; flush_delayed_work(&ip->i_gl->gl_work); gfs2_glock_add_to_lru(ip->i_gl); - gfs2_glock_put(ip->i_gl); + gfs2_glock_put(i_gl); ip->i_gl = NULL; if (ip->i_iopen_gh.gh_gl) { ip->i_iopen_gh.gh_gl->gl_object = NULL; -- 2.4.3