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 | 54ad7836bd81f6a2cab2026a66a2fb97c7a5fefb (patch) | |
| tree | c4e0d8a71624e5d1e0c4958564e41011ad2a0462 | |
| parent | 0137b514765b79cfe2cad44ec39e9db1c80386e9 (diff) | |
| download | upstream-54ad7836bd81f6a2cab2026a66a2fb97c7a5fefb.tar.gz upstream-54ad7836bd81f6a2cab2026a66a2fb97c7a5fefb.tar.bz2 upstream-54ad7836bd81f6a2cab2026a66a2fb97c7a5fefb.zip | |
[kernel] update mini_fo fix for 2.6.27
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12875 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -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 |