yaffs: Fix some 64-bit issues

Not previously compiling cleanly for 64-bit.

Signed-off-by: Charles Manning <cdhmanning@gmail.com>

diff --git a/yaffs_vfs.c b/yaffs_vfs.c
index 371ddd1dc9a4d29a8beabe43d052a66e9309a011..b1b6840939de4426e808a56ef4e9f16cdc54d3a5 100644 (file)
--- a/yaffs_vfs.c
+++ b/yaffs_vfs.c
@@ -512,7 +512,7 @@ static int yaffs_readlink(struct dentry *dentry, char __user *buffer,
 static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
        unsigned char *alias;
 static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
 {
        unsigned char *alias;

-       int ret;
+       void *ret;

        yaffs_dev_t *dev = yaffs_dentry_to_obj(dentry)->my_dev;
 
        yaffs_gross_lock(dev);
        yaffs_dev_t *dev = yaffs_dentry_to_obj(dentry)->my_dev;
 
        yaffs_gross_lock(dev);


@@ -521,14 +521,14 @@ static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
        yaffs_gross_unlock(dev);
 
        if (!alias) {
        yaffs_gross_unlock(dev);
 
        if (!alias) {

-               ret = -ENOMEM;
+               ret = ERR_PTR(-ENOMEM);

                goto out;
        }
 
        nd_set_link(nd, alias);
                goto out;
        }
 
        nd_set_link(nd, alias);

-       ret = (int)alias;
+       ret = (void *)alias;

 out:
 out:

-       return ERR_PTR(ret);
+       return ret;

 }
 
 void yaffs_put_link(struct dentry *dentry, struct nameidata *nd, void *alias) {
 }
 
 void yaffs_put_link(struct dentry *dentry, struct nameidata *nd, void *alias) {

diff --git a/yaffs_vfs_multi.c b/yaffs_vfs_multi.c
index d6c25b55a1dcbdbbbeafe21ea765b70b24e8a976..3bd5aea48e155c6e0312de2f9752821f59c047dc 100644 (file)
--- a/yaffs_vfs_multi.c
+++ b/yaffs_vfs_multi.c
@@ -730,12 +730,15 @@ 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)
 
 #if (YAFFS_NEW_FOLLOW_LINK == 1)
 static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)

+{
+       void *ret;

 #else
 static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
 #else
 static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)

-#endif

 {
 {

+       int ret
+#endif

        unsigned char *alias;
        unsigned char *alias;

-       int ret;
+       int ret_int = 0;

        yaffs_dev_t *dev = yaffs_dentry_to_obj(dentry)->my_dev;
 
        yaffs_gross_lock(dev);
        yaffs_dev_t *dev = yaffs_dentry_to_obj(dentry)->my_dev;
 
        yaffs_gross_lock(dev);


@@ -744,19 +747,23 @@ static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
        yaffs_gross_unlock(dev);
 
        if (!alias) {
        yaffs_gross_unlock(dev);
 
        if (!alias) {

-               ret = -ENOMEM;
+               ret_int = -ENOMEM;

                goto out;
        }
 
 #if (YAFFS_NEW_FOLLOW_LINK == 1)
        nd_set_link(nd, alias);
                goto out;
        }
 
 #if (YAFFS_NEW_FOLLOW_LINK == 1)
        nd_set_link(nd, alias);

-       ret = (int)alias;
+       ret = alias;

 out:
 out:

-       return ERR_PTR(ret);
+       if(ret_int)
+               ret = ERR_PTR(ret_int);
+       return ret;

 #else
        ret = vfs_follow_link(nd, alias);
        kfree(alias);
 out:
 #else
        ret = vfs_follow_link(nd, alias);
        kfree(alias);
 out:

+       if(ret_int)
+               ret = ret_int;

        return ret;
 #endif
 }
        return ret;
 #endif
 }