From 5fcba89a063d2e2bd9b6c0873a2e77465413c165 Mon Sep 17 00:00:00 2001 From: adilger Date: Fri, 20 Apr 2007 20:20:42 +0000 Subject: [PATCH] Branch HEAD Fix patch to apply equally well without obsolete ext3-san-jdike-*.patch. b=11725 --- ldiskfs/kernel_patches/patches/ext3-map_inode_page-2.6-suse.patch | 7 ++++--- lustre/kernel_patches/patches/ext3-map_inode_page-2.6-suse.patch | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ldiskfs/kernel_patches/patches/ext3-map_inode_page-2.6-suse.patch b/ldiskfs/kernel_patches/patches/ext3-map_inode_page-2.6-suse.patch index d2af494..2b6bcf1 100644 --- a/ldiskfs/kernel_patches/patches/ext3-map_inode_page-2.6-suse.patch +++ b/ldiskfs/kernel_patches/patches/ext3-map_inode_page-2.6-suse.patch @@ -73,13 +73,14 @@ Index: linux-2.6.0/fs/ext3/super.c =================================================================== --- linux-2.6.0.orig/fs/ext3/super.c 2003-12-31 00:33:49.000000000 +0300 +++ linux-2.6.0/fs/ext3/super.c 2003-12-31 01:10:40.000000000 +0300 -@@ -2051,6 +2051,9 @@ - int ext3_prep_san_write(struct inode *inode, long *blocks, +@@ -2051,6 +2051,10 @@ int nblocks, loff_t newsize); EXPORT_SYMBOL(ext3_prep_san_write); + +int ext3_map_inode_page(struct inode *inode, struct page *page, + unsigned long *blocks, int *created, int create); +EXPORT_SYMBOL(ext3_map_inode_page); - ++ MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others"); MODULE_DESCRIPTION("Second Extended Filesystem with journaling extensions"); + MODULE_LICENSE("GPL"); diff --git a/lustre/kernel_patches/patches/ext3-map_inode_page-2.6-suse.patch b/lustre/kernel_patches/patches/ext3-map_inode_page-2.6-suse.patch index d2af494..2b6bcf1 100644 --- a/lustre/kernel_patches/patches/ext3-map_inode_page-2.6-suse.patch +++ b/lustre/kernel_patches/patches/ext3-map_inode_page-2.6-suse.patch @@ -73,13 +73,14 @@ Index: linux-2.6.0/fs/ext3/super.c =================================================================== --- linux-2.6.0.orig/fs/ext3/super.c 2003-12-31 00:33:49.000000000 +0300 +++ linux-2.6.0/fs/ext3/super.c 2003-12-31 01:10:40.000000000 +0300 -@@ -2051,6 +2051,9 @@ - int ext3_prep_san_write(struct inode *inode, long *blocks, +@@ -2051,6 +2051,10 @@ int nblocks, loff_t newsize); EXPORT_SYMBOL(ext3_prep_san_write); + +int ext3_map_inode_page(struct inode *inode, struct page *page, + unsigned long *blocks, int *created, int create); +EXPORT_SYMBOL(ext3_map_inode_page); - ++ MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others"); MODULE_DESCRIPTION("Second Extended Filesystem with journaling extensions"); + MODULE_LICENSE("GPL"); -- 1.8.3.1