From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <io-uring-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
by smtp.lore.kernel.org (Postfix) with ESMTP id 844CCC43219
for <io-uring@archiver.kernel.org>; Thu, 26 May 2022 17:39:28 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S1348288AbiEZRj1 (ORCPT <rfc822;io-uring@archiver.kernel.org>);
Thu, 26 May 2022 13:39:27 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59802 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S1348331AbiEZRjJ (ORCPT
<rfc822;io-uring@vger.kernel.org>); Thu, 26 May 2022 13:39:09 -0400
Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7FA29A99C
for <io-uring@vger.kernel.org>; Thu, 26 May 2022 10:39:07 -0700 (PDT)
Received: from pps.filterd (m0089730.ppops.net [127.0.0.1])
by m0089730.ppops.net (8.17.1.5/8.17.1.5) with ESMTP id 24QFToHW031171
for <io-uring@vger.kernel.org>; Thu, 26 May 2022 10:39:07 -0700
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject
: date : message-id : in-reply-to : references : mime-version :
content-transfer-encoding : content-type; s=facebook;
bh=aWGWWAgH7Bi/du0tMMunpKLV8jXk2Gb/WQnwadv9en0=;
b=cmheUziun0bwCigSHPHDeqblxeiwxpmDuhNEGfB0HwU1pb8YEEs7OmRycylDKGe4GUIc
THudldAZY5HUkJb8pVFrf1VT8pC/qgcbiVL0UqQRp3ELRGBdAQEtkh8d3PaqsrUl2XXS
UYq2AUd6sOMQYPP8K9P+G39KQZZY7teIRwo=
Received: from maileast.thefacebook.com ([163.114.130.16])
by m0089730.ppops.net (PPS) with ESMTPS id 3gac8arx7p-6
(version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT)
for <io-uring@vger.kernel.org>; Thu, 26 May 2022 10:39:06 -0700
Received: from twshared14818.18.frc3.facebook.com (2620:10d:c0a8:1b::d) by
mail.thefacebook.com (2620:10d:c0a8:82::d) with Microsoft SMTP Server
(version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id
15.1.2375.28; Thu, 26 May 2022 10:39:05 -0700
Received: by devvm225.atn0.facebook.com (Postfix, from userid 425415)
id 8B611FA621DC; Thu, 26 May 2022 10:38:45 -0700 (PDT)
From: Stefan Roesch <shr@fb.com>
To: <io-uring@vger.kernel.org>, <kernel-team@fb.com>,
<linux-mm@kvack.org>, <linux-xfs@vger.kernel.org>,
<linux-fsdevel@vger.kernel.org>
CC: <shr@fb.com>, <david@fromorbit.com>, <jack@suse.cz>,
<hch@infradead.org>
Subject: [PATCH v6 08/16] fs: Split off inode_needs_update_time and __file_update_time
Date: Thu, 26 May 2022 10:38:32 -0700
Message-ID: <20220526173840.578265-9-shr@fb.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20220526173840.578265-1-shr@fb.com>
References: <20220526173840.578265-1-shr@fb.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-FB-Internal: Safe
Content-Type: text/plain
X-Proofpoint-ORIG-GUID: eX9ljf3qCUjlgt9o00sOSHBIRro3kub0
X-Proofpoint-GUID: eX9ljf3qCUjlgt9o00sOSHBIRro3kub0
X-Proofpoint-Virus-Version: vendor=baseguard
engine=ICAP:2.0.205,Aquarius:18.0.874,Hydra:6.0.486,FMLib:17.11.64.514
definitions=2022-05-26_09,2022-05-25_02,2022-02-23_01
Precedence: bulk
List-ID: <io-uring.vger.kernel.org>
X-Mailing-List: io-uring@vger.kernel.org
This splits off the functions inode_needs_update_time() and
__file_update_time() from the function file_update_time().
This is required to support async buffered writes.
No intended functional changes in this patch.
Signed-off-by: Stefan Roesch <shr@fb.com>
---
fs/inode.c | 76 +++++++++++++++++++++++++++++++++++-------------------
1 file changed, 50 insertions(+), 26 deletions(-)
diff --git a/fs/inode.c b/fs/inode.c
index ac1cf5aa78c8..c44573a32c6a 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -2049,35 +2049,18 @@ int file_remove_privs(struct file *file)
}
EXPORT_SYMBOL(file_remove_privs);
=20
-/**
- * file_update_time - update mtime and ctime time
- * @file: file accessed
- *
- * Update the mtime and ctime members of an inode and mark the inode
- * for writeback. Note that this function is meant exclusively for
- * usage in the file write path of filesystems, and filesystems may
- * choose to explicitly ignore update via this function with the
- * S_NOCMTIME inode flag, e.g. for network filesystem where these
- * timestamps are handled by the server. This can return an error for
- * file systems who need to allocate space in order to update an inode.
- */
-
-int file_update_time(struct file *file)
+static int inode_needs_update_time(struct inode *inode, struct timespec6=
4 *now)
{
- struct inode *inode =3D file_inode(file);
- struct timespec64 now;
int sync_it =3D 0;
- int ret;
=20
/* First try to exhaust all avenues to not sync */
if (IS_NOCMTIME(inode))
return 0;
=20
- now =3D current_time(inode);
- if (!timespec64_equal(&inode->i_mtime, &now))
+ if (!timespec64_equal(&inode->i_mtime, now))
sync_it =3D S_MTIME;
=20
- if (!timespec64_equal(&inode->i_ctime, &now))
+ if (!timespec64_equal(&inode->i_ctime, now))
sync_it |=3D S_CTIME;
=20
if (IS_I_VERSION(inode) && inode_iversion_need_inc(inode))
@@ -2086,15 +2069,50 @@ int file_update_time(struct file *file)
if (!sync_it)
return 0;
=20
- /* Finally allowed to write? Takes lock. */
- if (__mnt_want_write_file(file))
- return 0;
+ return sync_it;
+}
+
+static int __file_update_time(struct file *file, struct timespec64 *now,
+ int sync_mode)
+{
+ int ret =3D 0;
+ struct inode *inode =3D file_inode(file);
=20
- ret =3D inode_update_time(inode, &now, sync_it);
- __mnt_drop_write_file(file);
+ /* try to update time settings */
+ if (!__mnt_want_write_file(file)) {
+ ret =3D inode_update_time(inode, now, sync_mode);
+ __mnt_drop_write_file(file);
+ }
=20
return ret;
}
+
+ /**
+ * file_update_time - update mtime and ctime time
+ * @file: file accessed
+ *
+ * Update the mtime and ctime members of an inode and mark the inode fo=
r
+ * writeback. Note that this function is meant exclusively for usage in
+ * the file write path of filesystems, and filesystems may choose to
+ * explicitly ignore updates via this function with the _NOCMTIME inode
+ * flag, e.g. for network filesystem where these imestamps are handled
+ * by the server. This can return an error for file systems who need to
+ * allocate space in order to update an inode.
+ *
+ * Return: 0 on success, negative errno on failure.
+ */
+int file_update_time(struct file *file)
+{
+ int ret;
+ struct inode *inode =3D file_inode(file);
+ struct timespec64 now =3D current_time(inode);
+
+ ret =3D inode_needs_update_time(inode, &now);
+ if (ret <=3D 0)
+ return ret;
+
+ return __file_update_time(file, &now, ret);
+}
EXPORT_SYMBOL(file_update_time);
=20
/**
@@ -2111,6 +2129,8 @@ EXPORT_SYMBOL(file_update_time);
int file_modified(struct file *file)
{
int ret;
+ struct inode *inode =3D file_inode(file);
+ struct timespec64 now =3D current_time(inode);
=20
/*
* Clear the security bits if the process is not being run by root.
@@ -2123,7 +2143,11 @@ int file_modified(struct file *file)
if (unlikely(file->f_mode & FMODE_NOCMTIME))
return 0;
=20
- return file_update_time(file);
+ ret =3D inode_needs_update_time(inode, &now);
+ if (ret <=3D 0)
+ return ret;
+
+ return __file_update_time(file, &now, ret);
}
EXPORT_SYMBOL(file_modified);
=20
--=20
2.30.2