Attachment 161347 Details for Bug 252191 – My current patch

[patch] My current patch

for-bob.diff (text/plain), 2.14 KB, created by Steve Whitehouse on 2007-08-15 12:04:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Whitehouse

Created: 2007-08-15 12:04:01 UTC

Size: 2.14 KB

patch

obsolete

>diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
>index 00ab6c0..d0e6b42 100644
>--- a/fs/gfs2/log.c
>+++ b/fs/gfs2/log.c
>@@ -229,8 +229,10 @@ static void gfs2_ail2_empty_one(struct gfs2_sbd *sdp, struct gfs2_ail *ai)
> 		list_del(&bd->bd_ail_st_list);
> 		list_del(&bd->bd_ail_gl_list);
> 		atomic_dec(&bd->bd_gl->gl_ail_count);
>-		bh_ip = GFS2_I(bd->bd_bh->b_page->mapping->host);
>-		gfs2_meta_cache_flush(bh_ip);
>+		if (bd->bd_bh->b_page->mapping) {
>+			bh_ip = GFS2_I(bd->bd_bh->b_page->mapping->host);
>+			gfs2_meta_cache_flush(bh_ip);
>+		}
> 		brelse(bd->bd_bh);
> 	}
> }
>diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
>index 42a5f58..652c6cf 100644
>--- a/fs/gfs2/ops_address.c
>+++ b/fs/gfs2/ops_address.c
>@@ -616,58 +616,13 @@ static sector_t gfs2_bmap(struct address_space *mapping, sector_t lblock)
> 	return dblock;
> }
> 
>-static void discard_buffer(struct gfs2_sbd *sdp, struct buffer_head *bh)
>-{
>-	struct gfs2_bufdata *bd;
>-
>-	gfs2_log_lock(sdp);
>-	bd = bh->b_private;
>-	if (bd) {
>-		bd->bd_bh = NULL;
>-		bh->b_private = NULL;
>-		if (!bd->bd_ail && list_empty(&bd->bd_le.le_list))
>-			kmem_cache_free(gfs2_bufdata_cachep, bd);
>-	}
>-	gfs2_log_unlock(sdp);
>-
>-	lock_buffer(bh);
>-	clear_buffer_dirty(bh);
>-	bh->b_bdev = NULL;
>-	clear_buffer_mapped(bh);
>-	clear_buffer_req(bh);
>-	clear_buffer_new(bh);
>-	clear_buffer_delay(bh);
>-	unlock_buffer(bh);
>-}
>-
> static void gfs2_invalidatepage(struct page *page, unsigned long offset)
> {
>-	struct gfs2_sbd *sdp = GFS2_SB(page->mapping->host);
>-	struct buffer_head *head, *bh, *next;
>-	unsigned int curr_off = 0;
>-
> 	BUG_ON(!PageLocked(page));
> 	if (offset == 0)
> 		ClearPageChecked(page);
>-	if (!page_has_buffers(page))
>-		return;
>-
>-	bh = head = page_buffers(page);
>-	do {
>-		unsigned int next_off = curr_off + bh->b_size;
>-		next = bh->b_this_page;
>-
>-		if (offset <= curr_off)
>-			discard_buffer(sdp, bh);
>-
>-		curr_off = next_off;
>-		bh = next;
>-	} while (bh != head);
>-
>-	if (!offset)
>-		try_to_release_page(page, 0);
> 
>-	return;
>+	block_invalidatepage(page, offset);
> }
> 
> /**
>@@ -786,6 +741,7 @@ static unsigned limit = 0;
> 			fs_warn(sdp, "ip->i_cache[%u] = %s\n",
> 				x, (ip->i_cache[x]) ? "!NULL" : "NULL");
> 	}
>+	dump_stack();
> }
> 
> /**

Actions: View | Diff

Attachments on bug 252191: 161347 | 161356 | 161370 | 161376 | 161639