Attachment 161189 Details for Bug 250772 – Patch to fix the unstuff problem

[patch] Patch to fix the unstuff problem

gronk (text/plain), 3.31 KB, created by Robert Peterson on 2007-08-13 17:06:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Peterson

Created: 2007-08-13 17:06:14 UTC

Size: 3.31 KB

patch

obsolete

> fs/gfs2/bmap.c                  |    3 +-
> fs/gfs2/log.c                   |    6 +++-
> fs/gfs2/ops_address.c           |   52 +++-----------------------------------
> 3 files changed, 37 insertions(+), 90 deletions(-)
>
>diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c
>index cd805a6..8868b16 100644
>--- a/fs/gfs2/bmap.c
>+++ b/fs/gfs2/bmap.c
>@@ -95,7 +95,8 @@ static int gfs2_unstuffer_page(struct gfs2_inode *ip, struct buffer_head *dibh,
> 	set_buffer_uptodate(bh);
> 	if (sdp->sd_args.ar_data == GFS2_DATA_ORDERED || gfs2_is_jdata(ip))
> 		gfs2_trans_add_bh(ip->i_gl, bh, 0);
>-	mark_buffer_dirty(bh);
>+	if (!gfs2_is_jdata(ip))
>+		mark_buffer_dirty(bh);
> 
> 	if (release) {
> 		unlock_page(page);
>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..68db2a0 100644
>--- a/fs/gfs2/ops_address.c
>+++ b/fs/gfs2/ops_address.c
>@@ -371,7 +371,6 @@ static int gfs2_prepare_write(struct file *file, struct page *page,
> 	struct gfs2_alloc *al;
> 	unsigned int write_len = to - from;
> 
>-
> 	gfs2_holder_init(ip->i_gl, LM_ST_EXCLUSIVE, GL_ATIME|LM_FLAG_TRY_1CB, &ip->i_gh);
> 	error = gfs2_glock_nq_atime(&ip->i_gh);
> 	if (unlikely(error)) {
>@@ -616,58 +615,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);
> }
> 
> /**
>@@ -834,6 +788,10 @@ int gfs2_releasepage(struct page *page, gfp_t gfp_mask)
> 		gfs2_log_lock(sdp);
> 		bd = bh->b_private;
> 		if (bd) {
>+			if (!list_empty(&bd->bd_ail_st_list)) {
>+				gfs2_log_unlock(sdp);
>+				return 0;
>+			}
> 			gfs2_assert_warn(sdp, bd->bd_bh == bh);
> 			gfs2_assert_warn(sdp, list_empty(&bd->bd_list_tr));
> 			gfs2_assert_warn(sdp, !bd->bd_ail);

Actions: View | Diff

Attachments on bug 250772: 161189 | 161236