resync patches for 2.6.30-rc3

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.28 / 512-yaffs-2.6.28.1-fix.patch

diff --git a/target/linux/generic-2.6/patches-2.6.28/512-yaffs-2.6.28.1-fix.patch b/target/linux/generic-2.6/patches-2.6.28/512-yaffs-2.6.28.1-fix.patch
index 8415b6c..b80f481 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.28/512-yaffs-2.6.28.1-fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.28/512-yaffs-2.6.28.1-fix.patch
@@ -1,11 +1,11 @@
 --- a/fs/yaffs2/yaffs_fs.c
 +++ b/fs/yaffs2/yaffs_fs.c
 --- a/fs/yaffs2/yaffs_fs.c
 +++ b/fs/yaffs2/yaffs_fs.c

-@@ -745,7 +745,7 @@ static int yaffs_write_begin(struct file
-         
-       T(YAFFS_TRACE_OS, (KERN_DEBUG "start yaffs_write_begin\n"));
+@@ -746,7 +746,7 @@ static int yaffs_write_begin(struct file
+ 
+       T(YAFFS_TRACE_OS, ("start yaffs_write_begin\n"));

        /* Get a page */
        /* Get a page */

--      pg = __grab_cache_page(mapping,index);
-+      pg = grab_cache_page_write_begin(mapping, index, flags);
-       *pagep = pg;    
-       if(!pg){
-               ret =  -ENOMEM;
+-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 28)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
+       pg = grab_cache_page_write_begin(mapping, index, flags);
+ #else
+       pg = __grab_cache_page(mapping, index);