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=-9.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,USER_AGENT_GIT 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 AEDD9C2BA19 for ; Tue, 14 Apr 2020 12:43:42 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6F9562075E for ; Tue, 14 Apr 2020 12:43:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="OGC9aaPB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6F9562075E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id EFAFD8E0005; Tue, 14 Apr 2020 08:43:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E83F88E0001; Tue, 14 Apr 2020 08:43:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CFD1E8E0005; Tue, 14 Apr 2020 08:43:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0253.hostedemail.com [216.40.44.253]) by kanga.kvack.org (Postfix) with ESMTP id B7ED38E0001 for ; Tue, 14 Apr 2020 08:43:41 -0400 (EDT) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 7FB14181AEF21 for ; Tue, 14 Apr 2020 12:43:41 +0000 (UTC) X-FDA: 76706427042.22.bird96_2023aa6531a2a X-HE-Tag: bird96_2023aa6531a2a X-Filterd-Recvd-Size: 8000 Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by imf23.hostedemail.com (Postfix) with ESMTP for ; Tue, 14 Apr 2020 12:43:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1586868220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s/11mAo8TGof9fElMW//bJCzL1+izMSi4fkBrEjCedo=; b=OGC9aaPB3eJbJJJodWQ/ggOsRegysFSbO+rmdY1NOQ+mdYzV2XkvKGWDcpB7pDsdKY5v+x 69J53yz4KyVvm2CDxckdaWjF/RnGGhX00pXZaTadAr6XPIo46YG45NZu8yLvy3r17Vzkg/ WsaiIoQkfv2wNN8wYsWbms1kYzhgojE= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-148-hcZxQ2EIN1SDOnfW9ZimFQ-1; Tue, 14 Apr 2020 08:43:38 -0400 X-MC-Unique: hcZxQ2EIN1SDOnfW9ZimFQ-1 Received: by mail-wm1-f71.google.com with SMTP id f17so3710132wmm.5 for ; Tue, 14 Apr 2020 05:43:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MrMq7u1iV/F4rZQEqvhQ++V9yKrw5g/LWhjcaMYuCWg=; b=Q9/GvyuFfvhOEyX8nRjQ8r26b8gZf98fKPPjBue7wz230LRJl9Lv8zh5ZGsfBwlXQg 5dC9rsmCfL6hoiy0sJgf9o3R35IhtifUgfvDE8ty5BfIZkay83o47rp/5xLbg5zVvs1X 7bK1EFBRp4b+TKl4C+/JbBqnIs9ibKFXXdNFVGITuXaO9ut2+cvHda65QNc/AFjmv3le 5rD4PLkiYZg1ZYNnyT4AHiyDfnj+v7Hxujn51fSRRP8tEnnX+VTZ2PCT8uCTrLkWUN+j f7lmsY4cwofBpq15uWyqP6MQtiZ9edl+S7DiBrRCgzi55Bptg16Afhc3hyLRXpkyB6Bq s1HQ== X-Gm-Message-State: AGi0PubI1ZEF40p/RAPaBSM04OKn3jPQqCrMxKkIh1Mb97JIVveUxSdj 0c2J58odwtuWYL1ugApOCDn58coFibF7Z1L+vup0BaP6cSnTTV8mIWdpfI0Trc3+eLtI+mJA/fm olHWLyhBtBU0= X-Received: by 2002:adf:f34f:: with SMTP id e15mr18691195wrp.275.1586868217662; Tue, 14 Apr 2020 05:43:37 -0700 (PDT) X-Google-Smtp-Source: APiQypKieMHQMEHB64fOusIKVI0klz9UQdQ5a1y3lFWKhJD37VUle4YhX0YmwupcDiJWC0mdvqWDbw== X-Received: by 2002:adf:f34f:: with SMTP id e15mr18691124wrp.275.1586868217421; Tue, 14 Apr 2020 05:43:37 -0700 (PDT) Received: from localhost.localdomain ([194.230.155.210]) by smtp.gmail.com with ESMTPSA id m14sm16948816wrs.76.2020.04.14.05.43.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Apr 2020 05:43:36 -0700 (PDT) From: Emanuele Giuseppe Esposito To: linux-nfs@vger.kernel.org Cc: Paolo Bonzini , Emanuele Giuseppe Esposito , Jeremy Kerr , Arnd Bergmann , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Dennis Dalessandro , Mike Marciniszyn , Doug Ledford , Jason Gunthorpe , Frederic Barrat , Andrew Donnellan , Greg Kroah-Hartman , Robert Richter , "Manoj N. Kumar" , "Matthew R. Ochs" , Uma Krishnan , "James E.J. Bottomley" , "Martin K. Petersen" , Felipe Balbi , Alexander Viro , Ian Kent , Joel Becker , Christoph Hellwig , "Rafael J. Wysocki" , Matthew Garrett , Ard Biesheuvel , Miklos Szeredi , Mike Kravetz , Mark Fasheh , Joseph Qi , Alexey Dobriyan , Luis Chamberlain , Kees Cook , Iurii Zaikin , Anton Vorontsov , Colin Cross , Tony Luck , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , Andrii Nakryiko , John Fastabend , KP Singh , Hugh Dickins , Andrew Morton , "J. Bruce Fields" , Chuck Lever , Trond Myklebust , Anna Schumaker , "David S. Miller" , Jakub Kicinski , James Morris , "Serge E. Hallyn" , John Johansen , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rdma@vger.kernel.org, oprofile-list@lists.sf.net, linux-scsi@vger.kernel.org, linux-usb@vger.kernel.org, linux-fsdevel@vger.kernel.org, autofs@vger.kernel.org, linux-efi@vger.kernel.org, linux-mm@kvack.org, ocfs2-devel@oss.oracle.com, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-security-module@vger.kernel.org Subject: [PATCH 1/8] apparmor: just use vfs_kern_mount to make .null Date: Tue, 14 Apr 2020 14:42:55 +0200 Message-Id: <20200414124304.4470-2-eesposit@redhat.com> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200414124304.4470-1-eesposit@redhat.com> References: <20200414124304.4470-1-eesposit@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: aa_mk_null_file is using simple_pin_fs/simple_release_fs with local variables as arguments, for what would amount to a simple vfs_kern_mount/mntput pair if everything was inlined. Just use the normal filesystem API since the reference counting is not needed here. Signed-off-by: Emanuele Giuseppe Esposito --- security/apparmor/apparmorfs.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.= c index 280741fc0f5f..828bb1eb77ea 100644 --- a/security/apparmor/apparmorfs.c +++ b/security/apparmor/apparmorfs.c @@ -2525,14 +2525,14 @@ struct path aa_null; =20 static int aa_mk_null_file(struct dentry *parent) { -=09struct vfsmount *mount =3D NULL; +=09struct file_system_type *type =3D parent->d_sb->s_type; +=09struct vfsmount *mount; =09struct dentry *dentry; =09struct inode *inode; -=09int count =3D 0; -=09int error =3D simple_pin_fs(parent->d_sb->s_type, &mount, &count); =20 -=09if (error) -=09=09return error; +=09mount =3D vfs_kern_mount(type, SB_KERNMOUNT, type->name, NULL); +=09if (IS_ERR(mount)) +=09=09return PTR_ERR(mount); =20 =09inode_lock(d_inode(parent)); =09dentry =3D lookup_one_len(NULL_FILE_NAME, parent, strlen(NULL_FILE_NAME= )); @@ -2561,7 +2561,7 @@ static int aa_mk_null_file(struct dentry *parent) =09dput(dentry); out: =09inode_unlock(d_inode(parent)); -=09simple_release_fs(&mount, &count); +=09mntput(mount); =09return error; } =20 --=20 2.25.2