diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2012-04-16 11:40:56 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2012-04-24 11:44:36 -0400 |
commit | c50b91c4bd511dfe844e2aa7be429b6b88406353 (patch) | |
tree | 0a9584ec238036b599bb717db5bd1a7df5c616ca /fs/gfs2/log.c | |
parent | dad30e9031c5927c30b402f73ac57ffbe09dc9ee (diff) |
GFS2: Remove bd_list_tr
This is another clean up in the logging code. This per-transaction
list was largely unused. Its main function was to ensure that the
number of buffers in a transaction was correct, however that counter
was only used to check the number of buffers in the bd_list_tr, plus
an assert at the end of each transaction. With the assert now changed
to use the calculated buffer counts, we can remove both bd_list_tr and
its associated counter.
This should make the code easier to understand as well as shrinking
a couple of structures.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/log.c')
-rw-r--r-- | fs/gfs2/log.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c index f5eacb3589ba..2307218de6e4 100644 --- a/fs/gfs2/log.c +++ b/fs/gfs2/log.c | |||
@@ -696,21 +696,6 @@ static void log_refund(struct gfs2_sbd *sdp, struct gfs2_trans *tr) | |||
696 | gfs2_log_unlock(sdp); | 696 | gfs2_log_unlock(sdp); |
697 | } | 697 | } |
698 | 698 | ||
699 | static void buf_lo_incore_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr) | ||
700 | { | ||
701 | struct list_head *head = &tr->tr_list_buf; | ||
702 | struct gfs2_bufdata *bd; | ||
703 | |||
704 | gfs2_log_lock(sdp); | ||
705 | while (!list_empty(head)) { | ||
706 | bd = list_entry(head->next, struct gfs2_bufdata, bd_list_tr); | ||
707 | list_del_init(&bd->bd_list_tr); | ||
708 | tr->tr_num_buf--; | ||
709 | } | ||
710 | gfs2_log_unlock(sdp); | ||
711 | gfs2_assert_warn(sdp, !tr->tr_num_buf); | ||
712 | } | ||
713 | |||
714 | /** | 699 | /** |
715 | * gfs2_log_commit - Commit a transaction to the log | 700 | * gfs2_log_commit - Commit a transaction to the log |
716 | * @sdp: the filesystem | 701 | * @sdp: the filesystem |
@@ -729,8 +714,6 @@ static void buf_lo_incore_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr) | |||
729 | void gfs2_log_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr) | 714 | void gfs2_log_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr) |
730 | { | 715 | { |
731 | log_refund(sdp, tr); | 716 | log_refund(sdp, tr); |
732 | buf_lo_incore_commit(sdp, tr); | ||
733 | |||
734 | up_read(&sdp->sd_log_flush_lock); | 717 | up_read(&sdp->sd_log_flush_lock); |
735 | 718 | ||
736 | if (atomic_read(&sdp->sd_log_pinned) > atomic_read(&sdp->sd_log_thresh1) || | 719 | if (atomic_read(&sdp->sd_log_pinned) > atomic_read(&sdp->sd_log_thresh1) || |