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=ham 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 37ABFC00454 for ; Tue, 10 Dec 2019 12:31:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0D286208C3 for ; Tue, 10 Dec 2019 12:31:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="M8mAN/d2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727634AbfLJMb1 (ORCPT ); Tue, 10 Dec 2019 07:31:27 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:20718 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727620AbfLJMb1 (ORCPT ); Tue, 10 Dec 2019 07:31:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575981086; 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=NDMQ8ZZusnymGdD1DeUmcnElqMfkyYSpGkDRvNTptCs=; b=M8mAN/d2zKuz87MmKN/ajdsmMfSRjo0U03MK0BfN3nbaxeElCcwehx7a37SMoupWx4yhDe X1kIz/iXi7pkdXk8fOg79EivhCGUTR0ONCk6V8/dtyqtr6ujV89NlyUDYhReuT+/RW9DCZ z/Rg0OdjjbgL8T4AECgrlaYXgt0/pjo= 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-WULmPBKmNY-w0LexXlgTHw-1; Tue, 10 Dec 2019 07:31:17 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 83F24800D5A; 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 2048D60BE2; Tue, 10 Dec 2019 12:31:16 +0000 (UTC) Received: by coeurl.usersys.redhat.com (Postfix, from userid 1000) id 902FC20458; 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 01/27] saner calling conventions for nfs_fs_mount_common() Date: Tue, 10 Dec 2019 07:30:49 -0500 Message-Id: <20191210123115.1655-2-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.12 X-MC-Unique: WULmPBKmNY-w0LexXlgTHw-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 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 Signed-off-by: Al Viro --- 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 2c9cbade561a..beeaed872e6c 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 8d8d04bb9d64..f074c3773f0e 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