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

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

diff --git a/fs/nfs/nfs4super.c b/fs/nfs/nfs4super.c
index 469726410c5c0f52b1b58d2e71267fee9dc1bfeb..1475f932d7daabee0312a4e4430e120081266bce 100644 (file)
--- a/fs/nfs/nfs4super.c
+++ b/fs/nfs/nfs4super.c
@@ -35,12 +35,12 @@ static const struct super_operations nfs4_sops = {
 };
 
 struct nfs_subversion nfs_v4 = {
-       .owner = THIS_MODULE,
-       .nfs_fs   = &nfs4_fs_type,
-       .rpc_vers = &nfs_version4,
-       .rpc_ops  = &nfs_v4_clientops,
-       .sops     = &nfs4_sops,
-       .xattr    = nfs4_xattr_handlers,
+       .owner          = THIS_MODULE,
+       .nfs_fs         = &nfs4_fs_type,
+       .rpc_vers       = &nfs_version4,
+       .rpc_ops        = &nfs_v4_clientops,
+       .sops           = &nfs4_sops,
+       .xattr          = nfs4_xattr_handlers,
 };
 
 static int nfs4_write_inode(struct inode *inode, struct writeback_control *wbc)
@@ -168,7 +168,7 @@ static int do_nfs4_mount(struct nfs_server *server,
 
        root_ctx = nfs_fc2context(root_fc);
        root_ctx->internal = true;
-       root_ctx->mount_info.server = server;
+       root_ctx->server = server;
        /* We leave export_path unset as it's not used to find the root. */
 
        len = strlen(hostname) + 5;
@@ -221,10 +221,11 @@ int nfs4_try_get_tree(struct fs_context *fc)
        /* We create a mount for the server's root, walk to the requested
         * location and then create another mount for that.
         */
-       err= do_nfs4_mount(nfs4_create_server(&ctx->mount_info),
+       err= do_nfs4_mount(nfs4_create_server(fc),
                           fc, ctx->nfs_server.hostname,
                           ctx->nfs_server.export_path);
        if (err) {
+               nfs_errorf(fc, "NFS4: Couldn't follow remote path");
                dfprintk(MOUNT, "<-- nfs4_try_get_tree() = %d [error]\n", err);
        } else {
                dfprintk(MOUNT, "<-- nfs4_try_get_tree() = 0\n");
@@ -243,10 +244,11 @@ int nfs4_get_referral_tree(struct fs_context *fc)
        dprintk("--> nfs4_referral_mount()\n");
 
        /* create a new volume representation */
-       err = do_nfs4_mount(nfs4_create_referral_server(&ctx->clone_data, ctx->mount_info.mntfh),
+       err = do_nfs4_mount(nfs4_create_referral_server(fc),
                            fc, ctx->nfs_server.hostname,
                            ctx->nfs_server.export_path);
        if (err) {
+               nfs_errorf(fc, "NFS4: Couldn't follow remote path");
                dfprintk(MOUNT, "<-- nfs4_get_referral_tree() = %d [error]\n", err);
        } else {
                dfprintk(MOUNT, "<-- nfs4_get_referral_tree() = 0\n");
@@ -254,7 +256,6 @@ int nfs4_get_referral_tree(struct fs_context *fc)
        return err;
 }
 
-
 static int __init init_nfs_v4(void)
 {
        int err;