diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2014-02-25 11:52:20 +0000 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2014-02-25 11:52:20 +0000 |
| commit | b1ab1e44b4fa3df97a25cc9bcc3c99244ad6945b (patch) | |
| tree | 316bbe9643e5c3b6e3ce8ad9a23f7019299a412a | |
| parent | 47ba9734403770a4c5e685b01f0a72b835dd4fff (diff) | |
| download | op-kernel-dev-b1ab1e44b4fa3df97a25cc9bcc3c99244ad6945b.zip op-kernel-dev-b1ab1e44b4fa3df97a25cc9bcc3c99244ad6945b.tar.gz | |
GFS2: Remove extra "if" in gfs2_log_flush()
By reordering some of the assignments in gfs2_log_flush() it
is possible to remove one of the "if" statements as it can be
merged with one higher up the function.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
| -rw-r--r-- | fs/gfs2/log.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c index c1c9a29..edbd461 100644 --- a/fs/gfs2/log.c +++ b/fs/gfs2/log.c @@ -684,21 +684,19 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl) } trace_gfs2_log_flush(sdp, 1); + sdp->sd_log_flush_head = sdp->sd_log_head; + sdp->sd_log_flush_wrapped = 0; tr = sdp->sd_log_tr; if (tr) { sdp->sd_log_tr = NULL; INIT_LIST_HEAD(&tr->tr_ail1_list); INIT_LIST_HEAD(&tr->tr_ail2_list); + tr->tr_first = sdp->sd_log_flush_head; } gfs2_assert_withdraw(sdp, sdp->sd_log_num_revoke == sdp->sd_log_commited_revoke); - sdp->sd_log_flush_head = sdp->sd_log_head; - sdp->sd_log_flush_wrapped = 0; - if (tr) - tr->tr_first = sdp->sd_log_flush_head; - gfs2_ordered_write(sdp); lops_before_commit(sdp, tr); gfs2_log_flush_bio(sdp, WRITE); |
