yaffs: Change __uxx types to uxx

[yaffs2.git] / yaffs_vfs_multi.c

diff --git a/yaffs_vfs_multi.c b/yaffs_vfs_multi.c
index d6c25b55a1dcbdbbbeafe21ea765b70b24e8a976..8230537afa823cfba7b250af1b7d8c40b019ecf3 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)
+{
+       void *ret;
 #else
 static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd)
-#endif
 {
+       int ret
+#endif
        unsigned char *alias;
-       int ret;
+       int ret_int = 0;
        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) {
-               ret = -ENOMEM;
+               ret_int = -ENOMEM;
                goto out;
        }
 
 #if (YAFFS_NEW_FOLLOW_LINK == 1)
        nd_set_link(nd, alias);
-       ret = (int)alias;
+       ret = alias;
 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:
+       if(ret_int)
+               ret = ret_int;
        return ret;
 #endif
 }
@@ -1302,7 +1309,7 @@ static void yaffs_fill_inode_from_obj(struct inode *inode, yaffs_obj_t *obj)
 
 
                /* Check mode against the variant type and attempt to repair if broken. */
-               __u32 mode = obj->yst_mode;
+               u32 mode = obj->yst_mode;
                switch (obj->variant_type) {
                case YAFFS_OBJECT_TYPE_FILE:
                        if (!S_ISREG(mode)) {