Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / fs / nfs / namespace.c

diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c
index d537350c1fb704135338d23d93d3e4d751c34eb8..ad60774049473d3f600267282c275f217aa68510 100644 (file)
--- a/fs/nfs/namespace.c
+++ b/fs/nfs/namespace.c
@@ -281,7 +281,7 @@ int nfs_do_submount(struct fs_context *fc)
 
        p = nfs_devname(dentry, buffer, 4096);
        if (IS_ERR(p)) {
-               dprintk("NFS: Couldn't determine submount pathname\n");
+               nfs_errorf(fc, "NFS: Couldn't determine submount pathname");
                ret = PTR_ERR(p);
        } else {
                ret = vfs_parse_fs_string(fc, "source", p, buffer + 4096 - p);
@@ -301,7 +301,7 @@ int nfs_submount(struct fs_context *fc, struct nfs_server *server)
        int err;
 
        /* Look it up again to get its attributes */
-       err = server->nfs_client->rpc_ops->lookup(d_inode(parent), &dentry->d_name,
+       err = server->nfs_client->rpc_ops->lookup(d_inode(parent), dentry,
                                                  ctx->mntfh, ctx->clone_data.fattr,
                                                  NULL);
        dput(parent);