From patchwork Wed Nov 20 15:27:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Mayhew X-Patchwork-Id: 11254167 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 01E94930 for ; Wed, 20 Nov 2019 15:29:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D6F0B2068F for ; Wed, 20 Nov 2019 15:29:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="dO9DPCCI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730396AbfKTP2A (ORCPT ); Wed, 20 Nov 2019 10:28:00 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:47984 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729738AbfKTP16 (ORCPT ); Wed, 20 Nov 2019 10:27:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574263677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZAJgKPgEmBoP7WXUdRUa3y6uYgp7qiGb+CIHRCyRLT8=; b=dO9DPCCIdzaU6zCV2cInxxYv6u3FitY3lDWhfOQ3josTg50H4GehBmO+knSrpEaqEzeqeT Vi/ReQi8VrlaKbKWLd5C0+vhDoxZaFlOP+cL5cMGYfhgOpLzDV6i8SgdJVFScswSG9kmIk h9TiXFy6ng7jegy4Cq82IqdJvhVuonQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-396-4BvWXGJyNGORtRy0o3WvvQ-1; Wed, 20 Nov 2019 10:27:53 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9C4DB18B5F76; Wed, 20 Nov 2019 15:27:52 +0000 (UTC) Received: from coeurl.usersys.redhat.com (ovpn-123-90.rdu2.redhat.com [10.10.123.90]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6643160499; Wed, 20 Nov 2019 15:27:52 +0000 (UTC) Received: by coeurl.usersys.redhat.com (Postfix, from userid 1000) id 431F52095D; Wed, 20 Nov 2019 10:27:50 -0500 (EST) From: Scott Mayhew To: anna.schumaker@netapp.com, trond.myklebust@hammerspace.com Cc: dhowells@redhat.com, viro@zeniv.linux.org.uk, linux-nfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 06/27] nfs4: fold nfs_do_root_mount/nfs_follow_remote_path Date: Wed, 20 Nov 2019 10:27:29 -0500 Message-Id: <20191120152750.6880-7-smayhew@redhat.com> In-Reply-To: <20191120152750.6880-1-smayhew@redhat.com> References: <20191120152750.6880-1-smayhew@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: 4BvWXGJyNGORtRy0o3WvvQ-1 X-Mimecast-Spam-Score: 0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Al Viro Reviewed-by: David Howells Signed-off-by: Al Viro --- fs/nfs/nfs4super.c | 88 +++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 51 deletions(-) diff --git a/fs/nfs/nfs4super.c b/fs/nfs/nfs4super.c index a0b66f98f6ba..91ba1b6741dc 100644 --- a/fs/nfs/nfs4super.c +++ b/fs/nfs/nfs4super.c @@ -101,37 +101,6 @@ nfs4_remote_mount(struct file_system_type *fs_type, int flags, return nfs_fs_mount_common(flags, dev_name, info, &nfs_v4); } -static struct vfsmount *nfs_do_root_mount(struct nfs_server *server, int flags, - struct nfs_mount_info *info, - const char *hostname) -{ - struct vfsmount *root_mnt; - char *root_devname; - size_t len; - - if (IS_ERR(server)) - return ERR_CAST(server); - - len = strlen(hostname) + 5; - root_devname = kmalloc(len, GFP_KERNEL); - if (root_devname == NULL) { - nfs_free_server(server); - return ERR_PTR(-ENOMEM); - } - /* Does hostname needs to be enclosed in brackets? */ - if (strchr(hostname, ':')) - snprintf(root_devname, len, "[%s]:/", hostname); - else - snprintf(root_devname, len, "%s:/", hostname); - info->server = server; - root_mnt = vfs_kern_mount(&nfs4_remote_fs_type, flags, root_devname, info); - if (info->server) - nfs_free_server(info->server); - info->server = NULL; - kfree(root_devname); - return root_mnt; -} - struct nfs_referral_count { struct list_head list; const struct task_struct *task; @@ -198,11 +167,38 @@ static void nfs_referral_loop_unprotect(void) kfree(p); } -static struct dentry *nfs_follow_remote_path(struct vfsmount *root_mnt, - const char *export_path) +static struct dentry *do_nfs4_mount(struct nfs_server *server, int flags, + struct nfs_mount_info *info, + const char *hostname, + const char *export_path) { + struct vfsmount *root_mnt; struct dentry *dentry; + char *root_devname; int err; + size_t len; + + if (IS_ERR(server)) + return ERR_CAST(server); + + len = strlen(hostname) + 5; + root_devname = kmalloc(len, GFP_KERNEL); + if (root_devname == NULL) { + nfs_free_server(server); + return ERR_PTR(-ENOMEM); + } + + /* Does hostname needs to be enclosed in brackets? */ + if (strchr(hostname, ':')) + snprintf(root_devname, len, "[%s]:/", hostname); + else + snprintf(root_devname, len, "%s:/", hostname); + info->server = server; + root_mnt = vfs_kern_mount(&nfs4_remote_fs_type, flags, root_devname, info); + if (info->server) + nfs_free_server(info->server); + info->server = NULL; + kfree(root_devname); if (IS_ERR(root_mnt)) return ERR_CAST(root_mnt); @@ -223,22 +219,17 @@ struct dentry *nfs4_try_mount(int flags, const char *dev_name, struct nfs_mount_info *mount_info, struct nfs_subversion *nfs_mod) { - char *export_path; - struct vfsmount *root_mnt; - struct dentry *res; struct nfs_parsed_mount_data *data = mount_info->parsed; + struct dentry *res; mount_info->set_security = nfs_set_sb_security; dfprintk(MOUNT, "--> nfs4_try_mount()\n"); - export_path = data->nfs_server.export_path; - root_mnt = nfs_do_root_mount( - nfs4_create_server(mount_info, &nfs_v4), - flags, mount_info, - data->nfs_server.hostname); - - res = nfs_follow_remote_path(root_mnt, export_path); + res = do_nfs4_mount(nfs4_create_server(mount_info, &nfs_v4), + flags, mount_info, + data->nfs_server.hostname, + data->nfs_server.export_path); dfprintk(MOUNT, "<-- nfs4_try_mount() = %d%s\n", PTR_ERR_OR_ZERO(res), @@ -258,8 +249,6 @@ static struct dentry *nfs4_referral_mount(struct file_system_type *fs_type, .set_security = nfs_clone_sb_security, .cloned = data, }; - char *export_path; - struct vfsmount *root_mnt; struct dentry *res; dprintk("--> nfs4_referral_mount()\n"); @@ -268,13 +257,10 @@ static struct dentry *nfs4_referral_mount(struct file_system_type *fs_type, if (!mount_info.mntfh) return ERR_PTR(-ENOMEM); - export_path = data->mnt_path; - root_mnt = nfs_do_root_mount( - nfs4_create_referral_server(mount_info.cloned, - mount_info.mntfh), - flags, &mount_info, data->hostname); + res = do_nfs4_mount(nfs4_create_referral_server(mount_info.cloned, + mount_info.mntfh), + flags, &mount_info, data->hostname, data->mnt_path); - res = nfs_follow_remote_path(root_mnt, export_path); dprintk("<-- nfs4_referral_mount() = %d%s\n", PTR_ERR_OR_ZERO(res), IS_ERR(res) ? " [error]" : "");