From: Scott Mayhew <smayhew@redhat.com> 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 v4 04/26] nfs: fold nfs4_remote_fs_type and nfs4_remote_referral_fs_type Date: Fri, 13 Sep 2019 08:17:26 -0400 Message-ID: <20190913121748.25391-5-smayhew@redhat.com> (raw) In-Reply-To: <20190913121748.25391-1-smayhew@redhat.com> From: Al Viro <viro@zeniv.linux.org.uk> They are identical now. Reviewed-by: David Howells <dhowells@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> --- 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 773c347df3ab..d0237d8ffa2b 100644 --- a/fs/nfs/nfs4super.c +++ b/fs/nfs/nfs4super.c @@ -22,8 +22,6 @@ static struct dentry *nfs4_remote_mount(struct file_system_type *fs_type, int flags, const char *dev_name, void *raw_data); static struct dentry *nfs4_referral_mount(struct file_system_type *fs_type, int flags, const char *dev_name, void *raw_data); -static struct dentry *nfs4_remote_referral_mount(struct file_system_type *fs_type, - int flags, const char *dev_name, void *raw_data); static struct file_system_type nfs4_remote_fs_type = { .owner = THIS_MODULE, @@ -33,14 +31,6 @@ static struct file_system_type nfs4_remote_fs_type = { .fs_flags = FS_RENAME_DOES_D_MOVE|FS_BINARY_MOUNTDATA, }; -static struct file_system_type nfs4_remote_referral_fs_type = { - .owner = THIS_MODULE, - .name = "nfs4", - .mount = nfs4_remote_referral_mount, - .kill_sb = nfs_kill_super, - .fs_flags = FS_RENAME_DOES_D_MOVE|FS_BINARY_MOUNTDATA, -}; - struct file_system_type nfs4_referral_fs_type = { .owner = THIS_MODULE, .name = "nfs4", @@ -111,8 +101,7 @@ 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 file_system_type *fs_type, - struct nfs_server *server, int flags, +static struct vfsmount *nfs_do_root_mount(struct nfs_server *server, int flags, struct nfs_mount_info *info, const char *hostname) { @@ -135,7 +124,7 @@ static struct vfsmount *nfs_do_root_mount(struct file_system_type *fs_type, else snprintf(root_devname, len, "%s:/", hostname); info->server = server; - root_mnt = vfs_kern_mount(fs_type, flags, root_devname, info); + root_mnt = vfs_kern_mount(&nfs4_remote_fs_type, flags, root_devname, info); if (info->server) nfs_free_server(info->server); info->server = NULL; @@ -245,7 +234,7 @@ struct dentry *nfs4_try_mount(int flags, const char *dev_name, export_path = data->nfs_server.export_path; data->nfs_server.export_path = "/"; - root_mnt = nfs_do_root_mount(&nfs4_remote_fs_type, + root_mnt = nfs_do_root_mount( nfs4_create_server(mount_info, &nfs_v4), flags, mount_info, data->nfs_server.hostname); @@ -259,13 +248,6 @@ struct dentry *nfs4_try_mount(int flags, const char *dev_name, return res; } -static struct dentry * -nfs4_remote_referral_mount(struct file_system_type *fs_type, int flags, - const char *dev_name, void *raw_data) -{ - return 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_system_type *fs_type, export_path = data->mnt_path; data->mnt_path = "/"; - root_mnt = nfs_do_root_mount(&nfs4_remote_referral_fs_type, + root_mnt = nfs_do_root_mount( nfs4_create_referral_server(mount_info.cloned, mount_info.mntfh), flags, &mount_info, data->hostname); -- 2.17.2
next prev parent reply index Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-09-13 12:17 [PATCH v4 00/26] nfs: Mount API conversion Scott Mayhew 2019-09-13 12:17 ` [PATCH v4 01/26] saner calling conventions for nfs_fs_mount_common() Scott Mayhew 2019-09-13 12:17 ` [PATCH v4 02/26] nfs: stash server into struct nfs_mount_info Scott Mayhew 2019-09-13 12:17 ` [PATCH v4 03/26] nfs: lift setting mount_info from nfs4_remote{,_referral}_mount Scott Mayhew 2019-09-13 12:17 ` Scott Mayhew [this message] 2019-09-13 12:17 ` [PATCH v4 05/26] nfs: don't bother setting/restoring export_path around do_nfs_root_mount() Scott Mayhew 2019-09-13 12:17 ` [PATCH v4 06/26] nfs4: fold nfs_do_root_mount/nfs_follow_remote_path Scott Mayhew 2019-09-13 12:17 ` [PATCH v4 07/26] nfs: lift setting mount_info from nfs_xdev_mount() Scott Mayhew 2019-09-13 12:17 ` [PATCH v4 08/26] nfs: stash nfs_subversion reference into nfs_mount_info Scott Mayhew 2019-09-13 12:17 ` [PATCH v4 09/26] nfs: don't bother passing nfs_subversion to ->try_mount() and nfs_fs_mount_common() Scott Mayhew 2019-09-13 12:17 ` [PATCH v4 10/26] nfs: merge xdev and remote file_system_type Scott Mayhew 2019-09-13 12:17 ` [PATCH v4 11/26] nfs: unexport nfs_fs_mount_common() Scott Mayhew 2019-09-13 12:17 ` [PATCH v4 12/26] nfs: don't pass nfs_subversion to ->create_server() Scott Mayhew 2019-09-13 12:17 ` [PATCH v4 13/26] nfs: get rid of mount_info ->fill_super() Scott Mayhew 2019-09-13 12:17 ` [PATCH v4 14/26] nfs_clone_sb_security(): simplify the check for server bogosity Scott Mayhew 2019-09-13 12:17 ` [PATCH v4 15/26] nfs: get rid of ->set_security() Scott Mayhew 2019-09-13 12:17 ` [PATCH v4 16/26] NFS: Move mount parameterisation bits into their own file Scott Mayhew 2019-09-13 12:17 ` [PATCH v4 17/26] NFS: Constify mount argument match tables Scott Mayhew 2019-09-13 12:17 ` [PATCH v4 18/26] NFS: Rename struct nfs_parsed_mount_data to struct nfs_fs_context Scott Mayhew 2019-09-13 12:17 ` [PATCH v4 19/26] NFS: Split nfs_parse_mount_options() Scott Mayhew 2019-09-13 12:17 ` [PATCH v4 20/26] NFS: Deindent nfs_fs_context_parse_option() Scott Mayhew 2019-09-13 12:17 ` [PATCH v4 21/26] NFS: Add a small buffer in nfs_fs_context to avoid string dup Scott Mayhew 2019-09-13 12:17 ` [PATCH v4 22/26] NFS: Do some tidying of the parsing code Scott Mayhew 2019-09-13 12:17 ` [PATCH v4 23/26] NFS: rename nfs_fs_context pointer arg in a few functions Scott Mayhew 2019-09-13 12:17 ` [PATCH v4 24/26] NFS: Convert mount option parsing to use functionality from fs_parser.h Scott Mayhew 2019-09-13 12:17 ` [PATCH v4 25/26] NFS: Add fs_context support Scott Mayhew 2019-09-13 12:17 ` [PATCH v4 26/26] NFS: Attach supplementary error information to fs_context Scott Mayhew
Reply instructions: You may reply publically to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190913121748.25391-5-smayhew@redhat.com \ --to=smayhew@redhat.com \ --cc=anna.schumaker@netapp.com \ --cc=dhowells@redhat.com \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-nfs@vger.kernel.org \ --cc=trond.myklebust@hammerspace.com \ --cc=viro@zeniv.linux.org.uk \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Linux-NFS Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-nfs/0 linux-nfs/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-nfs linux-nfs/ https://lore.kernel.org/linux-nfs \ linux-nfs@vger.kernel.org public-inbox-index linux-nfs Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-nfs AGPL code for this site: git clone https://public-inbox.org/public-inbox.git