Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 693ddeabbb3e563f192a7ac74ec04168aa92e8d8

Authored by Bob Peterson
Committed by Steven Whitehouse
1 parent 905d2aefa9
Exists in master and in 7 other branches 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, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[GFS2] Revert part of earlier log.c changes 

This is patch 2 of 5 for bug #248176.

The list_move code previously concocted in log.c for bug #238162
(see https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=238162#c23)
never runs as bh can now never be NULL at this point.

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

Showing 1 changed file with 2 additions and 11 deletions Side-by-side Diff

... ... @@ -83,11 +83,6 @@
83 83  
84 84 gfs2_assert(sdp, bd->bd_ail == ai);
85 85  
86   - if (!bh){
87   - list_move(&bd->bd_ail_st_list, &ai->ai_ail2_list);
88   - continue;
89   - }
90   -
91 86 if (!buffer_busy(bh)) {
92 87 if (!buffer_uptodate(bh)) {
93 88 gfs2_log_unlock(sdp);
... ... @@ -130,11 +125,6 @@
130 125 bd_ail_st_list) {
131 126 bh = bd->bd_bh;
132 127  
133   - if (!bh){
134   - list_move(&bd->bd_ail_st_list, &ai->ai_ail2_list);
135   - continue;
136   - }
137   -
138 128 gfs2_assert(sdp, bd->bd_ail == ai);
139 129  
140 130 if (buffer_busy(bh)) {
141 131  
... ... @@ -155,13 +145,14 @@
155 145  
156 146 static void gfs2_ail1_start(struct gfs2_sbd *sdp, int flags)
157 147 {
158   - struct list_head *head = &sdp->sd_ail1_list;
  148 + struct list_head *head;
159 149 u64 sync_gen;
160 150 struct list_head *first;
161 151 struct gfs2_ail *first_ai, *ai, *tmp;
162 152 int done = 0;
163 153  
164 154 gfs2_log_lock(sdp);
  155 + head = &sdp->sd_ail1_list;
165 156 if (list_empty(head)) {
166 157 gfs2_log_unlock(sdp);
167 158 return;