rpms/kernel/F-11 linux-2.6-btrfs-fix-page-mkwrite.patch, NONE, 1.1 kernel.spec, 1.1607, 1.1608

[Josef Bacik]

Author: josef

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29225

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-btrfs-fix-page-mkwrite.patch 
Log Message:
- fixing page_mkwrite in btrfs so it matches what 2.6.29 expects


linux-2.6-btrfs-fix-page-mkwrite.patch:

--- NEW FILE linux-2.6-btrfs-fix-page-mkwrite.patch ---
diff -up linux-2.6.29.x86_64/fs/btrfs/inode.c.orig linux-2.6.29.x86_64/fs/btrfs/inode.c
--- linux-2.6.29.x86_64/fs/btrfs/inode.c.orig	2009-05-16 14:24:28.602294856 -0400
+++ linux-2.6.29.x86_64/fs/btrfs/inode.c	2009-05-16 14:25:13.497232334 -0400
@@ -4436,9 +4436,8 @@ static void btrfs_invalidatepage(struct 
  * beyond EOF, then the page is guaranteed safe against truncation until we
  * unlock the page.
  */
-int btrfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
+int btrfs_page_mkwrite(struct vm_area_struct *vma, struct page *page)
 {
-	struct page *page = vmf->page;
 	struct inode *inode = fdentry(vma->vm_file)->d_inode;
 	struct btrfs_root *root = BTRFS_I(inode)->root;
 	struct extent_io_tree *io_tree = &BTRFS_I(inode)->io_tree;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1607
retrieving revision 1.1608
diff -u -p -r1.1607 -r1.1608
--- kernel.spec	18 May 2009 12:34:36 -0000	1.1607
+++ kernel.spec	18 May 2009 13:37:45 -0000	1.1608
@@ -726,6 +726,7 @@ Patch2924: linux-2.6-ext4-clear-unwritte
 Patch2925: linux-2.6-ext4-fix-i_cached_extent-race.patch
 
 Patch3000: linux-2.6-btrfs-unstable-update.patch
+Patch3001: linux-2.6-btrfs-fix-page-mkwrite.patch
 Patch3010: linux-2.6-relatime-by-default.patch
 Patch3020: linux-2.6-fiemap-header-install.patch
 
@@ -1208,6 +1209,7 @@ ApplyPatch linux-2.6-ext4-fix-i_cached_e
 
 # btrfs
 ApplyPatch linux-2.6-btrfs-unstable-update.patch
+ApplyPatch linux-2.6-btrfs-fix-page-mkwrite.patch
 
 # relatime
 ApplyPatch linux-2.6-relatime-by-default.patch
@@ -1981,6 +1983,9 @@ fi
 # and build.
 
 %changelog
+* Mon May 18 2009 Josef Bacik <josef at toxicpanda.com>
+- fix page_mkwrite in btrfs
+
 * Mon May 18 2009 David Woodhouse <David.Woodhouse at intel.com>
 - Fix oops on FTDI removal.