aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2
diff options
context:
space:
mode:
authorBob Peterson <rpeterso@redhat.com>2007-07-24 15:07:33 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2007-10-10 03:54:53 -0400
commit693ddeabbb3e563f192a7ac74ec04168aa92e8d8 (patch)
treec82fb871747d8dc05c43d1627bb2f777a869a115 /fs/gfs2
parent905d2aefa9e06ebb995df96920d273a516fcd3f9 (diff)
[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>
Diffstat (limited to 'fs/gfs2')
-rw-r--r--fs/gfs2/log.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
index f49a12e24086..f7c0608332fb 100644
--- a/fs/gfs2/log.c
+++ b/fs/gfs2/log.c
@@ -83,11 +83,6 @@ static void gfs2_ail1_start_one(struct gfs2_sbd *sdp, struct gfs2_ail *ai)
83 83
84 gfs2_assert(sdp, bd->bd_ail == ai); 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 if (!buffer_busy(bh)) { 86 if (!buffer_busy(bh)) {
92 if (!buffer_uptodate(bh)) { 87 if (!buffer_uptodate(bh)) {
93 gfs2_log_unlock(sdp); 88 gfs2_log_unlock(sdp);
@@ -130,11 +125,6 @@ static int gfs2_ail1_empty_one(struct gfs2_sbd *sdp, struct gfs2_ail *ai, int fl
130 bd_ail_st_list) { 125 bd_ail_st_list) {
131 bh = bd->bd_bh; 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 gfs2_assert(sdp, bd->bd_ail == ai); 128 gfs2_assert(sdp, bd->bd_ail == ai);
139 129
140 if (buffer_busy(bh)) { 130 if (buffer_busy(bh)) {
@@ -155,13 +145,14 @@ static int gfs2_ail1_empty_one(struct gfs2_sbd *sdp, struct gfs2_ail *ai, int fl
155 145
156static void gfs2_ail1_start(struct gfs2_sbd *sdp, int flags) 146static 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 u64 sync_gen; 149 u64 sync_gen;
160 struct list_head *first; 150 struct list_head *first;
161 struct gfs2_ail *first_ai, *ai, *tmp; 151 struct gfs2_ail *first_ai, *ai, *tmp;
162 int done = 0; 152 int done = 0;
163 153
164 gfs2_log_lock(sdp); 154 gfs2_log_lock(sdp);
155 head = &sdp->sd_ail1_list;
165 if (list_empty(head)) { 156 if (list_empty(head)) {
166 gfs2_log_unlock(sdp); 157 gfs2_log_unlock(sdp);
167 return; 158 return;