mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-05 02:48:07 +02:00
27c303501e
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15468 3c298f89-4303-0410-b956-a3cf2f4a3e73
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
--- 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);
|