Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d0109bfa84d6603becac8c2e87b3716f557f2039

Authored by Bob Peterson
Committed by Steven Whitehouse
1 parent ca390601a8
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[GFS2] Only do lo_incore_commit once 

This patch is performance related.  When we're doing a log flush,
I noticed we were calling buf_lo_incore_commit twice: once for
data bufs and once for metadata bufs.  Since this is the same
function and does the same thing in both cases, there should be
no reason to call it twice.  Since we only need to call it once,
we can also make it faster by removing it from the generic "lops"
code and making it a stand-along static function.

Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

Showing 4 changed files with 17 additions and 29 deletions Side-by-side Diff

... ... @@ -44,7 +44,6 @@
44 44  
45 45 struct gfs2_log_operations {
46 46 void (*lo_add) (struct gfs2_sbd *sdp, struct gfs2_log_element *le);
47   - void (*lo_incore_commit) (struct gfs2_sbd *sdp, struct gfs2_trans *tr);
48 47 void (*lo_before_commit) (struct gfs2_sbd *sdp);
49 48 void (*lo_after_commit) (struct gfs2_sbd *sdp, struct gfs2_ail *ai);
50 49 void (*lo_before_scan) (struct gfs2_jdesc *jd,
... ... @@ -779,6 +779,21 @@
779 779 gfs2_log_unlock(sdp);
780 780 }
781 781  
  782 +static void buf_lo_incore_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr)
  783 +{
  784 + struct list_head *head = &tr->tr_list_buf;
  785 + struct gfs2_bufdata *bd;
  786 +
  787 + gfs2_log_lock(sdp);
  788 + while (!list_empty(head)) {
  789 + bd = list_entry(head->next, struct gfs2_bufdata, bd_list_tr);
  790 + list_del_init(&bd->bd_list_tr);
  791 + tr->tr_num_buf--;
  792 + }
  793 + gfs2_log_unlock(sdp);
  794 + gfs2_assert_warn(sdp, !tr->tr_num_buf);
  795 +}
  796 +
782 797 /**
783 798 * gfs2_log_commit - Commit a transaction to the log
784 799 * @sdp: the filesystem
... ... @@ -790,7 +805,7 @@
790 805 void gfs2_log_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr)
791 806 {
792 807 log_refund(sdp, tr);
793   - lops_incore_commit(sdp, tr);
  808 + buf_lo_incore_commit(sdp, tr);
794 809  
795 810 sdp->sd_vfs->s_dirt = 1;
796 811 up_read(&sdp->sd_log_flush_lock);
... ... @@ -152,21 +152,6 @@
152 152 unlock_buffer(bd->bd_bh);
153 153 }
154 154  
155   -static void buf_lo_incore_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr)
156   -{
157   - struct list_head *head = &tr->tr_list_buf;
158   - struct gfs2_bufdata *bd;
159   -
160   - gfs2_log_lock(sdp);
161   - while (!list_empty(head)) {
162   - bd = list_entry(head->next, struct gfs2_bufdata, bd_list_tr);
163   - list_del_init(&bd->bd_list_tr);
164   - tr->tr_num_buf--;
165   - }
166   - gfs2_log_unlock(sdp);
167   - gfs2_assert_warn(sdp, !tr->tr_num_buf);
168   -}
169   -
170 155 static void buf_lo_before_commit(struct gfs2_sbd *sdp)
171 156 {
172 157 struct buffer_head *bh;
... ... @@ -737,7 +722,6 @@
737 722  
738 723 const struct gfs2_log_operations gfs2_buf_lops = {
739 724 .lo_add = buf_lo_add,
740   - .lo_incore_commit = buf_lo_incore_commit,
741 725 .lo_before_commit = buf_lo_before_commit,
742 726 .lo_after_commit = buf_lo_after_commit,
743 727 .lo_before_scan = buf_lo_before_scan,
... ... @@ -763,7 +747,6 @@
763 747  
764 748 const struct gfs2_log_operations gfs2_databuf_lops = {
765 749 .lo_add = databuf_lo_add,
766   - .lo_incore_commit = buf_lo_incore_commit,
767 750 .lo_before_commit = databuf_lo_before_commit,
768 751 .lo_after_commit = databuf_lo_after_commit,
769 752 .lo_scan_elements = databuf_lo_scan_elements,
1 1 /*
2 2 * Copyright (C) Sistina Software, Inc. 1997-2003 All rights reserved.
3   - * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved.
  3 + * Copyright (C) 2004-2008 Red Hat, Inc. All rights reserved.
4 4 *
5 5 * This copyrighted material is made available to anyone wishing to use,
6 6 * modify, copy, or redistribute it subject to the terms and conditions
... ... @@ -55,15 +55,6 @@
55 55 {
56 56 if (le->le_ops->lo_add)
57 57 le->le_ops->lo_add(sdp, le);
58   -}
59   -
60   -static inline void lops_incore_commit(struct gfs2_sbd *sdp,
61   - struct gfs2_trans *tr)
62   -{
63   - int x;
64   - for (x = 0; gfs2_log_ops[x]; x++)
65   - if (gfs2_log_ops[x]->lo_incore_commit)
66   - gfs2_log_ops[x]->lo_incore_commit(sdp, tr);
67 58 }
68 59  
69 60 static inline void lops_before_commit(struct gfs2_sbd *sdp)