Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
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 v5 01/27] saner calling conventions for nfs_fs_mount_common()
Date:   Wed, 20 Nov 2019 10:27:24 -0500
Message-Id: <20191120152750.6880-2-smayhew@redhat.com>
In-Reply-To: <20191120152750.6880-1-smayhew@redhat.com>
References: <20191120152750.6880-1-smayhew@redhat.com>
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

From: Al Viro <viro@zeniv.linux.org.uk>

Allow it to take ERR_PTR() for server and return ERR_CAST() of it in
such case.  All callers used to open-code that...

Reviewed-by: David Howells <dhowells@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
 fs/nfs/nfs4super.c | 16 +---------------
 fs/nfs/super.c     | 11 ++++-------
 2 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/fs/nfs/nfs4super.c b/fs/nfs/nfs4super.c
index 04c57066a11a..baece9857bcf 100644
--- a/fs/nfs/nfs4super.c
+++ b/fs/nfs/nfs4super.c
@@ -110,21 +110,12 @@ nfs4_remote_mount(struct file_system_type *fs_type, i=
nt flags,
 {
 =09struct nfs_mount_info *mount_info =3D info;
 =09struct nfs_server *server;
-=09struct dentry *mntroot =3D ERR_PTR(-ENOMEM);
=20
 =09mount_info->set_security =3D nfs_set_sb_security;
=20
 =09/* Get a volume representation */
 =09server =3D nfs4_create_server(mount_info, &nfs_v4);
-=09if (IS_ERR(server)) {
-=09=09mntroot =3D ERR_CAST(server);
-=09=09goto out;
-=09}
-
-=09mntroot =3D nfs_fs_mount_common(server, flags, dev_name, mount_info, &n=
fs_v4);
-
-out:
-=09return mntroot;
+=09return nfs_fs_mount_common(server, flags, dev_name, mount_info, &nfs_v4=
);
 }
=20
 static struct vfsmount *nfs_do_root_mount(struct file_system_type *fs_type=
,
@@ -280,11 +271,6 @@ nfs4_remote_referral_mount(struct file_system_type *fs=
_type, int flags,
=20
 =09/* create a new volume representation */
 =09server =3D nfs4_create_referral_server(mount_info.cloned, mount_info.mn=
tfh);
-=09if (IS_ERR(server)) {
-=09=09mntroot =3D ERR_CAST(server);
-=09=09goto out;
-=09}
-
 =09mntroot =3D nfs_fs_mount_common(server, flags, dev_name, &mount_info, &=
nfs_v4);
 out:
 =09nfs_free_fhandle(mount_info.mntfh);
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index a84df7d63403..9d2f1d6a5b9a 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -1903,9 +1903,6 @@ struct dentry *nfs_try_mount(int flags, const char *d=
ev_name,
 =09else
 =09=09server =3D nfs_mod->rpc_ops->create_server(mount_info, nfs_mod);
=20
-=09if (IS_ERR(server))
-=09=09return ERR_CAST(server);
-
 =09return nfs_fs_mount_common(server, flags, dev_name, mount_info, nfs_mod=
);
 }
 EXPORT_SYMBOL_GPL(nfs_try_mount);
@@ -2666,6 +2663,9 @@ struct dentry *nfs_fs_mount_common(struct nfs_server =
*server,
 =09};
 =09int error;
=20
+=09if (IS_ERR(server))
+=09=09return ERR_CAST(server);
+
 =09if (server->flags & NFS_MOUNT_UNSHARED)
 =09=09compare_super =3D NULL;
=20
@@ -2814,10 +2814,7 @@ nfs_xdev_mount(struct file_system_type *fs_type, int=
 flags,
 =09/* create a new volume representation */
 =09server =3D nfs_mod->rpc_ops->clone_server(NFS_SB(data->sb), data->fh, d=
ata->fattr, data->authflavor);
=20
-=09if (IS_ERR(server))
-=09=09mntroot =3D ERR_CAST(server);
-=09else
-=09=09mntroot =3D nfs_fs_mount_common(server, flags,
+=09mntroot =3D nfs_fs_mount_common(server, flags,
 =09=09=09=09dev_name, &mount_info, nfs_mod);
=20
 =09dprintk("<-- nfs_xdev_mount() =3D %ld\n",
--=20
2.17.2