port generic and ixp4xx kernel patches to 2.6.27 (compiles except for iptables, but...
[openwrt/svn-archive/archive.git] / target / linux / generic-2.6 / patches-2.6.27 / 213-mini_fo_2.6.27_fixes.patch
1 --- a/fs/mini_fo/inode.c
2 +++ b/fs/mini_fo/inode.c
3 @@ -439,7 +439,7 @@
4 int err=0;
5 dentry_t *hidden_sto_dentry;
6 dentry_t *hidden_sto_dir_dentry;
7 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
8 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
9 umode_t mode;
10 #endif
11
12 @@ -466,7 +466,7 @@
13 down(&hidden_sto_dir_dentry->d_inode->i_sem);
14 #endif
15
16 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
17 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
18 mode = S_IALLUGO;
19 err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
20 hidden_sto_dentry, symname, mode);
21 @@ -1151,7 +1151,9 @@
22 * goto out;
23 */
24
25 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
26 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
27 + err = generic_permission(hidden_inode, mask, NULL);
28 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
29 err = permission(hidden_inode, mask, nd);
30 #else
31 err = permission(hidden_inode, mask);