Attachment 153023 Details for Bug 236087 – Patch to attempt to fix the problem encountered

[patch] Patch to attempt to fix the problem encountered

zero.diff (text/plain), 1.06 KB, created by Steve Whitehouse on 2007-04-19 16:24:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Whitehouse

Created: 2007-04-19 16:24:34 UTC

Size: 1.06 KB

patch

obsolete

>diff --git a/fs/gfs2/ops_address.c b/fs/gfs2/ops_address.c
>index 90c2879..30c1562 100644
>--- a/fs/gfs2/ops_address.c
>+++ b/fs/gfs2/ops_address.c
>@@ -197,7 +197,19 @@ static int stuffed_readpage(struct gfs2_inode *ip, struct page *page)
> 	void *kaddr;
> 	int error;
> 
>-	BUG_ON(page->index);
>+	/*
>+	 * Due to the order of unstuffing files and ->nopage(), we can be
>+	 * asked for a zero page in the case of a stuffed file being extended,
>+	 * so we need to supply one here. It doesn't happen often.
>+	 */
>+	if (unlikely(page->index)) {
>+		kaddr = kmap_atomic(page, KM_USER0);
>+		memset(kaddr, 0, PAGE_CACHE_SIZE);
>+		kunmap_atomic(kaddr, KM_USER0);
>+		flush_dcache_page(page);
>+		SetPageUptodate(page);
>+		return 0;
>+	}
> 
> 	error = gfs2_meta_inode_buffer(ip, &dibh);
> 	if (error)
>@@ -208,9 +220,8 @@ static int stuffed_readpage(struct gfs2_inode *ip, struct page *page)
> 	       ip->i_di.di_size);
> 	memset(kaddr + ip->i_di.di_size, 0, PAGE_CACHE_SIZE - ip->i_di.di_size);
> 	kunmap_atomic(kaddr, KM_USER0);
>-
>+	flush_dcache_page(page);
> 	brelse(dibh);
>-
> 	SetPageUptodate(page);
> 
> 	return 0;

Actions: View | Diff

Attachments on bug 236087: 152323 | 153023 | 154462