[cavium-octeon] update to 2.6.30-rc5

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.27 / 213-mini_fo_2.6.27_fixes.patch

diff --git a/target/linux/generic-2.6/patches-2.6.27/213-mini_fo_2.6.27_fixes.patch b/target/linux/generic-2.6/patches-2.6.27/213-mini_fo_2.6.27_fixes.patch
index a7b4e4a..f92c18b 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.27/213-mini_fo_2.6.27_fixes.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/213-mini_fo_2.6.27_fixes.patch
@@ -1,6 +1,6 @@
 --- a/fs/mini_fo/inode.c
 +++ b/fs/mini_fo/inode.c
 --- a/fs/mini_fo/inode.c
 +++ b/fs/mini_fo/inode.c

-@@ -439,7 +439,7 @@
+@@ -439,7 +439,7 @@ mini_fo_symlink(inode_t *dir, dentry_t *

        int err=0;
        dentry_t *hidden_sto_dentry;
        dentry_t *hidden_sto_dir_dentry;
        int err=0;
        dentry_t *hidden_sto_dentry;
        dentry_t *hidden_sto_dir_dentry;


@@ -9,7 +9,7 @@
          umode_t mode;
  #endif
  
          umode_t mode;
  #endif
  

-@@ -466,7 +466,7 @@
+@@ -466,7 +466,7 @@ mini_fo_symlink(inode_t *dir, dentry_t *

        down(&hidden_sto_dir_dentry->d_inode->i_sem);
  #endif
  
        down(&hidden_sto_dir_dentry->d_inode->i_sem);
  #endif
  


@@ -18,13 +18,23 @@
        mode = S_IALLUGO;
        err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
                          hidden_sto_dentry, symname, mode);
        mode = S_IALLUGO;
        err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
                          hidden_sto_dentry, symname, mode);

-@@ -1151,7 +1151,9 @@
+@@ -1128,7 +1128,7 @@ void mini_fo_put_link(struct dentry *den
+ #endif
+ 
+ STATIC int
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
+ mini_fo_permission(inode_t *inode, int mask, struct nameidata *nd)
+ #else
+ mini_fo_permission(inode_t *inode, int mask)
+@@ -1150,8 +1150,9 @@ mini_fo_permission(inode_t *inode, int m
+        *      if (err)

         *              goto out;
         */
         *              goto out;
         */

- 
+-

 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)

-+      err = generic_permission(hidden_inode, mask, NULL);
++      err = inode_permission(hidden_inode, mask);

 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
        err = permission(hidden_inode, mask, nd);
  #else
 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
        err = permission(hidden_inode, mask, nd);
  #else