Attachment 154462 Details for Bug 236087 – Patch for RHEL 5.1

[patch] Patch for RHEL 5.1

mmap-fix.diff (text/plain), 1.61 KB, created by Steve Whitehouse on 2007-05-10 10:23:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Whitehouse

Created: 2007-05-10 10:23:50 UTC

Size: 1.61 KB

patch

obsolete

>--- linux-rhel-base/fs/gfs2/ops_address.c	2007-05-10 11:13:49.000000000 +0100
>+++ linux-2.6.18.noarch/fs/gfs2/ops_address.c	2007-05-10 11:17:30.000000000 +0100
>@@ -156,19 +156,6 @@
> 	return 0;
> }
> 
>-static int zero_readpage(struct page *page)
>-{
>-	void *kaddr;
>-
>-	kaddr = kmap_atomic(page, KM_USER0);
>-	memset(kaddr, 0, PAGE_CACHE_SIZE);
>-	kunmap_atomic(kaddr, KM_USER0);
>-
>-	SetPageUptodate(page);
>-
>-	return 0;
>-}
>-
> /**
>  * stuffed_readpage - Fill in a Linux page with stuffed file data
>  * @ip: the inode
>@@ -183,9 +170,19 @@
> 	void *kaddr;
> 	int error;
> 
>-	/* Only the first page of a stuffed file might contain data */
>-	if (unlikely(page->index))
>-		return zero_readpage(page);
>+	/*
>+	 * 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)
>@@ -196,9 +193,8 @@
> 	       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;
>@@ -755,6 +751,9 @@
> 			if (!atomic_read(&aspace->i_writecount))
> 				return 0;
> 
>+			if (!(gfp_mask & __GFP_WAIT))
>+				return 0;
>+
> 			if (time_after_eq(jiffies, t)) {
> 				stuck_releasepage(bh);
> 				/* should we withdraw here? */

Actions: View | Diff

Attachments on bug 236087: 152323 | 153023 | 154462