Message ID | 20230705190309.579783-87-jlayton@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2096980vqx; Wed, 5 Jul 2023 12:43:50 -0700 (PDT) X-Google-Smtp-Source: APBJJlGUB/iEqlFV0y36HbBpiZvdMap3BIksGmoRbF4Mp50lhwAZ0XM53eKa9KdStd5l4bKi1zV2 X-Received: by 2002:a17:90a:3988:b0:262:ec13:d3d with SMTP id z8-20020a17090a398800b00262ec130d3dmr12516151pjb.18.1688586230371; Wed, 05 Jul 2023 12:43:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688586230; cv=none; d=google.com; s=arc-20160816; b=VealQwDkDZ6K5PAXqvqWq2qfe7evrwdc3CEjq0AZL2+WWkERrxFNLDc7AN4dDjvhPJ /xMyVDSxzAFJ9a7gjz2hyKBhcNhb/QZd6H14CcBtep2jM+vgOFc4LIVqQAKiWGYOjwwT 0+jDf7aHOrnnWaFCAFztADGjFaSyoTVZv4Kn5GwEI7cRJdxwUggA9895q/fdnJ3VNr1m a0cKm0Ukb0XS2yHbXlQemWnf0zVvekEl3937wzOgUjguznzvnNmNS7kOPGnxJWAfiCrm yJYWhc2gb6WXrKWR2Tjk1PZcehdvIfz4ZVPC8LoIjuk36FnnXOlR5+oM6ByL34TQNYm9 jDmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=MOsnav18iYqFZ1Yygak9tCaNPEpv67xnki5KwCjoYUg=; fh=T0juAWR+Y6rbLDCVAbeKOkyvavtntncQff2iY47RrIE=; b=FSrPZeS51vitKKcUfSEueCBQJs+jCFwatg5Vtcn8OGF38dY6WfAxjPumEUhRgf2UII HXJuwenjKpWZ8dR1BZA0UXJUxsP1cEwUB1yCZ4gGEbbnLJG/cQk9ojmv+S3FVFTx6kee YjtQRUCKpeQRab45IyMx4wT++6oKIMikilCZULhqir9BKhT5MoTU4C59dRYoKik0W3+U h+OXZzFHYB3kNNF0+fh5yXBe83Mx4f0+pMze0Zp8ayjoFw/USEGvRslcaIDLL/C0aeE0 hbY4rXcNbyjaBG6j4qH9OKTKnlwfAKbpguF3dv1g+G5eEBpnGgmkfEP1kjO0pEtKIoKY /aNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=n1SGksIN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bx19-20020a17090af49300b00263cee680ecsi2290430pjb.89.2023.07.05.12.43.35; Wed, 05 Jul 2023 12:43:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=n1SGksIN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233755AbjGETLP (ORCPT <rfc822;tebrre53rla2o@gmail.com> + 99 others); Wed, 5 Jul 2023 15:11:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234104AbjGETKa (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 5 Jul 2023 15:10:30 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA1FC3C3F; Wed, 5 Jul 2023 12:05:56 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0CD87616FC; Wed, 5 Jul 2023 19:05:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6872EC433C8; Wed, 5 Jul 2023 19:05:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1688583945; bh=TXSxRuiJHKwV/2Aw+LtmUoK8B39D2LWcTb8UoUWUREI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n1SGksING+sQkSnN9pPB8r2jPmytKLeyeNQ0IzlMjkQkcicrH6T9e8aGRlLggrjhe J6B4enXwNi16W4Ah8QPypWlzkFqH/iXM7cWqjd/cNYkaPrP0KaV6hjZrjRKHjCyFZa g2DUNicQOhlYpSZciRlbC9RcyVoh9r5mjlOaTey4Yv0cMYJdPGvUaZopG8lTw1zb9a EhEBFvnzo8gpXeJGfjhh1EeFc2c3kqZzKxVnRrMxUib82DKwTaZtyo9dmJNp/zS653 XUtANaW6EQC42ddwpG8D/c+sBtdhPJtoTwMnW/QAxTRUrYUfuFm49RseWr/a2IpHJY f5QKpWIh9oHFA== From: Jeff Layton <jlayton@kernel.org> To: Christian Brauner <brauner@kernel.org>, John Johansen <john.johansen@canonical.com>, Paul Moore <paul@paul-moore.com>, James Morris <jmorris@namei.org>, "Serge E. Hallyn" <serge@hallyn.com> Cc: Al Viro <viro@zeniv.linux.org.uk>, Jan Kara <jack@suse.cz>, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, apparmor@lists.ubuntu.com, linux-security-module@vger.kernel.org Subject: [PATCH v2 89/92] apparmor: convert to ctime accessor functions Date: Wed, 5 Jul 2023 15:01:54 -0400 Message-ID: <20230705190309.579783-87-jlayton@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230705190309.579783-1-jlayton@kernel.org> References: <20230705185755.579053-1-jlayton@kernel.org> <20230705190309.579783-1-jlayton@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770610995105135811?= X-GMAIL-MSGID: =?utf-8?q?1770610995105135811?= |
Series |
[v2,01/92] ibmvmc: update ctime in conjunction with mtime on write
|
|
Commit Message
Jeff Layton
July 5, 2023, 7:01 p.m. UTC
In later patches, we're going to change how the inode's ctime field is
used. Switch to using accessor functions instead of raw accesses of
inode->i_ctime.
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
security/apparmor/apparmorfs.c | 6 +++---
security/apparmor/policy_unpack.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
Comments
On Wed 05-07-23 15:01:54, Jeff Layton wrote: > In later patches, we're going to change how the inode's ctime field is > used. Switch to using accessor functions instead of raw accesses of > inode->i_ctime. > > Signed-off-by: Jeff Layton <jlayton@kernel.org> Looks good. Feel free to add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > security/apparmor/apparmorfs.c | 6 +++--- > security/apparmor/policy_unpack.c | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c > index 3d0d370d6ffd..7dbd0a5aaeeb 100644 > --- a/security/apparmor/apparmorfs.c > +++ b/security/apparmor/apparmorfs.c > @@ -226,7 +226,7 @@ static int __aafs_setup_d_inode(struct inode *dir, struct dentry *dentry, > > inode->i_ino = get_next_ino(); > inode->i_mode = mode; > - inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode); > + inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode); > inode->i_private = data; > if (S_ISDIR(mode)) { > inode->i_op = iops ? iops : &simple_dir_inode_operations; > @@ -1557,7 +1557,7 @@ void __aafs_profile_migrate_dents(struct aa_profile *old, > if (new->dents[i]) { > struct inode *inode = d_inode(new->dents[i]); > > - inode->i_mtime = inode->i_ctime = current_time(inode); > + inode->i_mtime = inode_set_ctime_current(inode); > } > old->dents[i] = NULL; > } > @@ -2546,7 +2546,7 @@ static int aa_mk_null_file(struct dentry *parent) > > inode->i_ino = get_next_ino(); > inode->i_mode = S_IFCHR | S_IRUGO | S_IWUGO; > - inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode); > + inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode); > init_special_inode(inode, S_IFCHR | S_IRUGO | S_IWUGO, > MKDEV(MEM_MAJOR, 3)); > d_instantiate(dentry, inode); > diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c > index ed180722a833..8b8846073e14 100644 > --- a/security/apparmor/policy_unpack.c > +++ b/security/apparmor/policy_unpack.c > @@ -89,10 +89,10 @@ void __aa_loaddata_update(struct aa_loaddata *data, long revision) > struct inode *inode; > > inode = d_inode(data->dents[AAFS_LOADDATA_DIR]); > - inode->i_mtime = inode->i_ctime = current_time(inode); > + inode->i_mtime = inode_set_ctime_current(inode); > > inode = d_inode(data->dents[AAFS_LOADDATA_REVISION]); > - inode->i_mtime = inode->i_ctime = current_time(inode); > + inode->i_mtime = inode_set_ctime_current(inode); > } > } > > -- > 2.41.0 >
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c index 3d0d370d6ffd..7dbd0a5aaeeb 100644 --- a/security/apparmor/apparmorfs.c +++ b/security/apparmor/apparmorfs.c @@ -226,7 +226,7 @@ static int __aafs_setup_d_inode(struct inode *dir, struct dentry *dentry, inode->i_ino = get_next_ino(); inode->i_mode = mode; - inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode); + inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode); inode->i_private = data; if (S_ISDIR(mode)) { inode->i_op = iops ? iops : &simple_dir_inode_operations; @@ -1557,7 +1557,7 @@ void __aafs_profile_migrate_dents(struct aa_profile *old, if (new->dents[i]) { struct inode *inode = d_inode(new->dents[i]); - inode->i_mtime = inode->i_ctime = current_time(inode); + inode->i_mtime = inode_set_ctime_current(inode); } old->dents[i] = NULL; } @@ -2546,7 +2546,7 @@ static int aa_mk_null_file(struct dentry *parent) inode->i_ino = get_next_ino(); inode->i_mode = S_IFCHR | S_IRUGO | S_IWUGO; - inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode); + inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode); init_special_inode(inode, S_IFCHR | S_IRUGO | S_IWUGO, MKDEV(MEM_MAJOR, 3)); d_instantiate(dentry, inode); diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c index ed180722a833..8b8846073e14 100644 --- a/security/apparmor/policy_unpack.c +++ b/security/apparmor/policy_unpack.c @@ -89,10 +89,10 @@ void __aa_loaddata_update(struct aa_loaddata *data, long revision) struct inode *inode; inode = d_inode(data->dents[AAFS_LOADDATA_DIR]); - inode->i_mtime = inode->i_ctime = current_time(inode); + inode->i_mtime = inode_set_ctime_current(inode); inode = d_inode(data->dents[AAFS_LOADDATA_REVISION]); - inode->i_mtime = inode->i_ctime = current_time(inode); + inode->i_mtime = inode_set_ctime_current(inode); } }