aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.31/213-mini_fo_2.6.27_fixes.patch
blob: f92c18b254fe3a64d398be9691277c289d65f392 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
--- a/fs/mini_fo/inode.c
+++ b/fs/mini_fo/inode.c
@@ -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;
-#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))
         umode_t mode;
 #endif
 
@@ -466,7 +466,7 @@ mini_fo_symlink(inode_t *dir, dentry_t *
 	down(&hidden_sto_dir_dentry->d_inode->i_sem);
 #endif
 
-#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))
 	mode = S_IALLUGO;
 	err = vfs_symlink(hidden_sto_dir_dentry->d_inode,
 			  hidden_sto_dentry, symname, mode);
@@ -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;
 	 */
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
+	err = inode_permission(hidden_inode, mask);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 	err = permission(hidden_inode, mask, nd);
 #else
 	err = permission(hidden_inode, mask);