lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[GFS2] Revert part of earlier log.c changes

Browse Source 
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>
This commit is contained in:
Bob Peterson
2007-07-24 14:07:33 -05:00
committed by Steven Whitehouse
parent 905d2aefa9
commit 693ddeabbb
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
fs/gfs2/log.c
View File

@@ -83,11 +83,6 @@ static void gfs2_ail1_start_one(struct gfs2_sbd *sdp, struct gfs2_ail *ai)
gfs2_assert(sdp, bd->bd_ail == ai); gfs2_assert(sdp, bd->bd_ail == ai);
if (!bh){
list_move(&bd->bd_ail_st_list, &ai->ai_ail2_list);
continue;
}
if (!buffer_busy(bh)) { if (!buffer_busy(bh)) {
if (!buffer_uptodate(bh)) { if (!buffer_uptodate(bh)) {
gfs2_log_unlock(sdp); gfs2_log_unlock(sdp);
@@ -130,11 +125,6 @@ static int gfs2_ail1_empty_one(struct gfs2_sbd *sdp, struct gfs2_ail *ai, int fl
bd_ail_st_list) { bd_ail_st_list) {
bh = bd->bd_bh; bh = bd->bd_bh;
if (!bh){
list_move(&bd->bd_ail_st_list, &ai->ai_ail2_list);
continue;
}
gfs2_assert(sdp, bd->bd_ail == ai); gfs2_assert(sdp, bd->bd_ail == ai);
if (buffer_busy(bh)) { if (buffer_busy(bh)) {
@@ -155,13 +145,14 @@ static int gfs2_ail1_empty_one(struct gfs2_sbd *sdp, struct gfs2_ail *ai, int fl
static void gfs2_ail1_start(struct gfs2_sbd *sdp, int flags) static void gfs2_ail1_start(struct gfs2_sbd *sdp, int flags)
{ {
struct list_head *head = &sdp->sd_ail1_list; struct list_head *head;
u64 sync_gen; u64 sync_gen;
struct list_head *first; struct list_head *first;
struct gfs2_ail *first_ai, *ai, *tmp; struct gfs2_ail *first_ai, *ai, *tmp;
int done = 0; int done = 0;
gfs2_log_lock(sdp); gfs2_log_lock(sdp);
head = &sdp->sd_ail1_list;
if (list_empty(head)) { if (list_empty(head)) {
gfs2_log_unlock(sdp); gfs2_log_unlock(sdp);
return; return;