diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2008-10-06 17:24:33 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2008-10-06 17:24:33 +0000 |
commit | 19fd45301c86ad02ef7cd15f148ca3d1008048af (patch) | |
tree | b37dc66a0ed67a64f7426d8be09439b863d8883a /target/linux/generic-2.6 | |
parent | ece4ca493b3c631c4f80fd845df9553869099c85 (diff) | |
download | upstream-19fd45301c86ad02ef7cd15f148ca3d1008048af.tar.gz upstream-19fd45301c86ad02ef7cd15f148ca3d1008048af.tar.bz2 upstream-19fd45301c86ad02ef7cd15f148ca3d1008048af.zip |
update mini_fo fix for 2.6.27
SVN-Revision: 12875
Diffstat (limited to 'target/linux/generic-2.6')
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.27/213-mini_fo_2.6.27_fixes.patch | 16 |
1 files changed, 13 insertions, 3 deletions
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 a7b4e4ace4..6e995911a4 100644 --- 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 @@ -18,13 +18,23 @@ 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 @@ + #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 @@ + * if (err) * goto out; */ - +- -#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 |