summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.29/213-mini_fo_2.6.27_fixes.patch
diff options
context:
space:
mode:
authorHamish Guthrie <hcg@openwrt.org>2009-05-28 10:00:48 +0000
committerHamish Guthrie <hcg@openwrt.org>2009-05-28 10:00:48 +0000
commit7adb67f18469e51cecb83a0c2efbf22494acb244 (patch)
treefe225b163b00d82bf2dfa88ec105309675690049 /target/linux/generic-2.6/patches-2.6.29/213-mini_fo_2.6.27_fixes.patch
parent52d975c359b8330e2844d3bb942588bd5afd73e6 (diff)
downloadmaster-31e0f0ae-7adb67f18469e51cecb83a0c2efbf22494acb244.tar.gz
master-31e0f0ae-7adb67f18469e51cecb83a0c2efbf22494acb244.tar.bz2
master-31e0f0ae-7adb67f18469e51cecb83a0c2efbf22494acb244.zip
revert 15922 - add back 2.6.29 kernel support
SVN-Revision: 16127
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.29/213-mini_fo_2.6.27_fixes.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.29/213-mini_fo_2.6.27_fixes.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.29/213-mini_fo_2.6.27_fixes.patch b/target/linux/generic-2.6/patches-2.6.29/213-mini_fo_2.6.27_fixes.patch
new file mode 100644
index 0000000000..f92c18b254
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.29/213-mini_fo_2.6.27_fixes.patch
@@ -0,0 +1,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);