From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90A63C2D0BF for ; Tue, 10 Dec 2019 12:33:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 60EB020838 for ; Tue, 10 Dec 2019 12:33:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ZPlrcnFl" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727536AbfLJMdD (ORCPT ); Tue, 10 Dec 2019 07:33:03 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:59451 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727440AbfLJMbY (ORCPT ); Tue, 10 Dec 2019 07:31:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575981082; 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=mry2ia3HH1mUDFGyHjP5oM7iAP6SkMwKC6nrAYNAFlg=; b=ZPlrcnFl9y7w+jup9qgkoMEcMtz/J+0/lAjRlop2m0tYlepS01kl4UAUNqKj2eETvkcrS9 fdj6yE3d6PtyUWmiNQK1288xhSQDXfxDjJ7/nap8mNE2uev6vrLE6C86CG/nMMD+fTDPCt B13utB79J4S6s3vyY3XKIYRpanjTg48= 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-384-n4ov0NGENoSYTr7cDShT4Q-1; Tue, 10 Dec 2019 07:31:17 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 922F82F34; Tue, 10 Dec 2019 12:31:16 +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 203FC5C21B; Tue, 10 Dec 2019 12:31:16 +0000 (UTC) Received: by coeurl.usersys.redhat.com (Postfix, from userid 1000) id A087720BC1; Tue, 10 Dec 2019 07:31:15 -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, linux-security-module@vger.kernel.org Subject: [PATCH v6 04/27] nfs: fold nfs4_remote_fs_type and nfs4_remote_referral_fs_type Date: Tue, 10 Dec 2019 07:30:52 -0500 Message-Id: <20191210123115.1655-5-smayhew@redhat.com> In-Reply-To: <20191210123115.1655-1-smayhew@redhat.com> References: <20191210123115.1655-1-smayhew@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: n4ov0NGENoSYTr7cDShT4Q-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Al Viro They are identical now. Reviewed-by: David Howells Signed-off-by: Al Viro --- fs/nfs/nfs4super.c | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/fs/nfs/nfs4super.c b/fs/nfs/nfs4super.c index ac3e8928643d..54dbb4561ccc 100644 --- a/fs/nfs/nfs4super.c +++ b/fs/nfs/nfs4super.c @@ -22,8 +22,6 @@ static struct dentry *nfs4_remote_mount(struct file_syste= m_type *fs_type, =09int flags, const char *dev_name, void *raw_data); static struct dentry *nfs4_referral_mount(struct file_system_type *fs_type= , =09int flags, const char *dev_name, void *raw_data); -static struct dentry *nfs4_remote_referral_mount(struct file_system_type *= fs_type, -=09int flags, const char *dev_name, void *raw_data); =20 static struct file_system_type nfs4_remote_fs_type =3D { =09.owner=09=09=3D THIS_MODULE, @@ -33,14 +31,6 @@ static struct file_system_type nfs4_remote_fs_type =3D { =09.fs_flags=09=3D FS_RENAME_DOES_D_MOVE|FS_BINARY_MOUNTDATA, }; =20 -static struct file_system_type nfs4_remote_referral_fs_type =3D { -=09.owner=09=09=3D THIS_MODULE, -=09.name=09=09=3D "nfs4", -=09.mount=09=09=3D nfs4_remote_referral_mount, -=09.kill_sb=09=3D nfs_kill_super, -=09.fs_flags=09=3D FS_RENAME_DOES_D_MOVE|FS_BINARY_MOUNTDATA, -}; - struct file_system_type nfs4_referral_fs_type =3D { =09.owner=09=09=3D THIS_MODULE, =09.name=09=09=3D "nfs4", @@ -111,8 +101,7 @@ nfs4_remote_mount(struct file_system_type *fs_type, int= flags, =09return nfs_fs_mount_common(flags, dev_name, info, &nfs_v4); } =20 -static struct vfsmount *nfs_do_root_mount(struct file_system_type *fs_type= , -=09=09=09=09=09 struct nfs_server *server, int flags, +static struct vfsmount *nfs_do_root_mount(struct nfs_server *server, int f= lags, =09=09=09=09=09 struct nfs_mount_info *info, =09=09=09=09=09 const char *hostname) { @@ -135,7 +124,7 @@ static struct vfsmount *nfs_do_root_mount(struct file_s= ystem_type *fs_type, =09else =09=09snprintf(root_devname, len, "%s:/", hostname); =09info->server =3D server; -=09root_mnt =3D vfs_kern_mount(fs_type, flags, root_devname, info); +=09root_mnt =3D vfs_kern_mount(&nfs4_remote_fs_type, flags, root_devname, = info); =09if (info->server) =09=09nfs_free_server(info->server); =09info->server =3D NULL; @@ -245,7 +234,7 @@ struct dentry *nfs4_try_mount(int flags, const char *de= v_name, =20 =09export_path =3D data->nfs_server.export_path; =09data->nfs_server.export_path =3D "/"; -=09root_mnt =3D nfs_do_root_mount(&nfs4_remote_fs_type, +=09root_mnt =3D nfs_do_root_mount( =09=09=09nfs4_create_server(mount_info, &nfs_v4), =09=09=09flags, mount_info, =09=09=09data->nfs_server.hostname); @@ -259,13 +248,6 @@ struct dentry *nfs4_try_mount(int flags, const char *d= ev_name, =09return res; } =20 -static struct dentry * -nfs4_remote_referral_mount(struct file_system_type *fs_type, int flags, -=09=09=09 const char *dev_name, void *raw_data) -{ -=09return nfs_fs_mount_common(flags, dev_name, raw_data, &nfs_v4); -} - /* * Create an NFS4 server record on referral traversal */ @@ -290,7 +272,7 @@ static struct dentry *nfs4_referral_mount(struct file_s= ystem_type *fs_type, =20 =09export_path =3D data->mnt_path; =09data->mnt_path =3D "/"; -=09root_mnt =3D nfs_do_root_mount(&nfs4_remote_referral_fs_type, +=09root_mnt =3D nfs_do_root_mount( =09=09=09nfs4_create_referral_server(mount_info.cloned, =09=09=09=09=09=09 mount_info.mntfh), =09=09=09flags, &mount_info, data->hostname); --=20 2.17.2