linux/generic: update yaffs for kernel 4.4
authoracoul <alex@ozo.com>
Thu, 31 Mar 2016 04:58:06 +0000 (07:58 +0300)
committeracoul <alex@ozo.com>
Thu, 31 Mar 2016 05:28:36 +0000 (08:28 +0300)
target/linux/generic/patches-4.4/506-4.4-follow_link_fix.patch [new file with mode: 0644]

diff --git a/target/linux/generic/patches-4.4/506-4.4-follow_link_fix.patch b/target/linux/generic/patches-4.4/506-4.4-follow_link_fix.patch
new file mode 100644 (file)
index 0000000..4194ab2
--- /dev/null
@@ -0,0 +1,44 @@
+As what we did in commit 680baacbca69 ("new ->follow_link() and
+->put_link() calling conventions").
+
+Signed-off-by: Kevin Hao <kexin.hao at windriver.com>
+---
+ fs/yaffs2/yaffs_vfs.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c
+index 0a3e9da..1494c8f 100644
+--- a/fs/yaffs2/yaffs_vfs.c
++++ b/fs/yaffs2/yaffs_vfs.c
+@@ -1060,7 +1060,7 @@ static int yaffs_readlink(struct dentry *dentry, char __user * buffer,
+ }
+ #if (YAFFS_NEW_FOLLOW_LINK == 1)
+-static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
++static const char *yaffs_follow_link(struct dentry *dentry, void **cookie)
+ {
+       void *ret;
+ #else
+@@ -1082,7 +1082,7 @@ static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
+               goto out;
+       }
+ #if (YAFFS_NEW_FOLLOW_LINK == 1)
+-      nd_set_link(nd, alias);
++      *cookie = alias;
+       ret = alias;
+ out:
+       if (ret_int)
+@@ -1114,9 +1114,9 @@ static void yaffs_put_inode(struct inode *inode)
+ #endif
+ #if (YAFFS_NEW_FOLLOW_LINK == 1)
+-void yaffs_put_link(struct dentry *dentry, struct nameidata *nd, void *alias)
++void yaffs_put_link(struct inode *inode, void *cookie)
+ {
+-      kfree(alias);
++      kfree(cookie);
+ }
+ #endif
+-- 
+1.9.1