fix hostfs_open() use of ->f_path.dentry

[linux-2.6-microblaze.git] / fs / hostfs / hostfs_kern.c

diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
index e6b8c49..aea3545 100644 (file)
--- a/fs/hostfs/hostfs_kern.c
+++ b/fs/hostfs/hostfs_kern.c
@@ -139,8 +139,8 @@ static char *inode_name(struct inode *ino)
 
 static char *follow_link(char *link)
 {
-       int len, n;
        char *name, *resolved, *end;
+       int n;
 
        name = __getname();
        if (!name) {
@@ -164,15 +164,13 @@ static char *follow_link(char *link)
                return name;
 
        *(end + 1) = '\0';
-       len = strlen(link) + strlen(name) + 1;
 
-       resolved = kmalloc(len, GFP_KERNEL);
+       resolved = kasprintf(GFP_KERNEL, "%s%s", link, name);
        if (resolved == NULL) {
                n = -ENOMEM;
                goto out_free;
        }
 
-       sprintf(resolved, "%s%s", link, name);
        __putname(name);
        kfree(link);
        return resolved;
@@ -317,7 +315,7 @@ retry:
        if (mode & FMODE_WRITE)
                r = w = 1;
 
-       name = dentry_name(file->f_path.dentry);
+       name = dentry_name(d_real(file->f_path.dentry, file->f_inode));
        if (name == NULL)
                return -ENOMEM;
 
@@ -921,18 +919,16 @@ static int hostfs_fill_sb_common(struct super_block *sb, void *d, int silent)
        sb->s_d_op = &simple_dentry_operations;
        sb->s_maxbytes = MAX_LFS_FILESIZE;
 
-       /* NULL is printed as <NULL> by sprintf: avoid that. */
+       /* NULL is printed as '(null)' by printf(): avoid that. */
        if (req_root == NULL)
                req_root = "";
 
        err = -ENOMEM;
        sb->s_fs_info = host_root_path =
-               kmalloc(strlen(root_ino) + strlen(req_root) + 2, GFP_KERNEL);
+               kasprintf(GFP_KERNEL, "%s/%s", root_ino, req_root);
        if (host_root_path == NULL)
                goto out;
 
-       sprintf(host_root_path, "%s/%s", root_ino, req_root);
-
        root_inode = new_inode(sb);
        if (!root_inode)
                goto out;