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 9b344fcd23b0a9a87d829e2879002b54b90b0c3a..ad60774049473d3f600267282c275f217aa68510 100644 (file)
--- a/fs/nfs/namespace.c
+++ b/fs/nfs/namespace.c
@@ -176,8 +176,8 @@ struct vfsmount *nfs_d_automount(struct path *path)
 
        ctx->version            = client->rpc_ops->version;
        ctx->minorversion       = client->cl_minorversion;
-       ctx->mount_info.nfs_mod = client->cl_nfs_mod;
-       __module_get(ctx->mount_info.nfs_mod->owner);
+       ctx->nfs_mod            = client->cl_nfs_mod;
+       __module_get(ctx->nfs_mod->owner);
 
        ret = client->rpc_ops->submount(fc, server);
        if (ret < 0) {
@@ -262,26 +262,26 @@ int nfs_do_submount(struct fs_context *fc)
        int ret;
 
        /* create a new volume representation */
-       server = ctx->mount_info.nfs_mod->rpc_ops->clone_server(NFS_SB(ctx->clone_data.sb),
-                                                    ctx->mount_info.mntfh,
+       server = ctx->nfs_mod->rpc_ops->clone_server(NFS_SB(ctx->clone_data.sb),
+                                                    ctx->mntfh,
                                                     ctx->clone_data.fattr,
                                                     ctx->selected_flavor);
 
        if (IS_ERR(server))
                return PTR_ERR(server);
 
-       ctx->mount_info.server = server;
+       ctx->server = server;
 
        buffer = kmalloc(4096, GFP_USER);
        if (!buffer)
                return -ENOMEM;
 
        ctx->internal           = true;
-       ctx->mount_info.inherited_bsize = ctx->clone_data.sb->s_blocksize_bits;
+       ctx->clone_data.inherited_bsize = ctx->clone_data.sb->s_blocksize_bits;
 
        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,8 +301,8 @@ 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,
-                                                 ctx->mount_info.mntfh, ctx->clone_data.fattr,
+       err = server->nfs_client->rpc_ops->lookup(d_inode(parent), dentry,
+                                                 ctx->mntfh, ctx->clone_data.fattr,
                                                  NULL);
        dput(parent);
        if (err != 0)