[backfire] backport r26906
[openwrt/svn-archive/archive.git] / target / linux / generic-2.6 / patches-2.6.32 / 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 @@ mini_fo_symlink(inode_t *dir, dentry_t *
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 @@ mini_fo_symlink(inode_t *dir, dentry_t *
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 @@ -1128,7 +1128,7 @@ void mini_fo_put_link(struct dentry *den
22 #endif
23
24 STATIC int
25 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
26 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) && (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27))
27 mini_fo_permission(inode_t *inode, int mask, struct nameidata *nd)
28 #else
29 mini_fo_permission(inode_t *inode, int mask)
30 @@ -1150,8 +1150,9 @@ mini_fo_permission(inode_t *inode, int m
31 * if (err)
32 * goto out;
33 */
34 -
35 -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
36 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
37 + err = inode_permission(hidden_inode, mask);
38 +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
39 err = permission(hidden_inode, mask, nd);
40 #else
41 err = permission(hidden_inode, mask);