From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B9E342D6401; Wed, 17 Dec 2025 06:10:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765951843; cv=none; b=OVXOBSAiKD1ZDYqZBoSWEC7rfTJGgnr8RIUnG9bFqUP6V0kyyi4rcLAjAw/MWoAgVDpHNsahhjqMUHJTTbbjHViOlFY44A8qH5E1lFpeHgxeBTxH3md9S9WE98DfSttVjbHYbwgZ+4C471NuS4o8yQ5pESdeqkf/OtPeQ982VQs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765951843; c=relaxed/simple; bh=mG2PmgVDyuDuBBMP0oEujnBn5ZRsm5oTQwPMA2QJoII=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MVkzzYa4QcUAB6IDx8MjUN6nkRjGeyiIgnFk7V1H5xsHcNcmlcGvZwbxvRRTrW4J4AGzs4nZlNN0brhPSY9Nx8WXz0DtmdIaP0VGEwMMz/1q3OMEEoN32bn0VAhC8UMSVE5H9iuOdeqcfMK7qPvDs8lBusEmsdtAWp/3m5DcJPk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=jjbUhjzu; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="jjbUhjzu" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=tRUa7Rl1dRbBO67JGDeBR683UJh/Sd6qTahEp1yS/wU=; b=jjbUhjzucDRY1+KoyM+ZaEPIzX cFdd1dB7+bRe3m9i7/894pGSGi7gsZbWDrWk8xo54MaVtHudjaomhDZ8KIFg6z4yUNvZvWDbY4Oxv 83ceqRO9l2YlxKsSMIBEgZsKPdzBF/ydRRgSHKOuGxOTmI6QEL4bFWpJeZ8PtTH9Z7K6wBNmA+xkB aUPkeotlZHTjpKPzeLuCitd+uDu6WKVOfcyFVkxt4m8UXilt0HfMSXAguUqAZRqIQdZDxgdrU7lti ONAYze6t4w+ef2dQ3ZXMKaaANWD/xwo97jN0nZw9WyrrjBCUCfyZmV1ugjDgI6EARHYAYnzhGbf9A 2PKjBSig==; Received: from 2a02-8389-2341-5b80-d601-7564-c2e0-491c.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:d601:7564:c2e0:491c] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.98.2 #2 (Red Hat Linux)) id 1vVkkB-00000006DQ0-023r; Wed, 17 Dec 2025 06:10:39 +0000 From: Christoph Hellwig To: Christian Brauner Cc: Al Viro , David Sterba , Jan Kara , Mike Marshall , Martin Brandenburg , Carlos Maiolino , Stefan Roesch , Jeff Layton , linux-kernel@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, gfs2@lists.linux.dev, io-uring@vger.kernel.org, devel@lists.orangefs.org, linux-unionfs@vger.kernel.org, linux-mtd@lists.infradead.org, linux-xfs@vger.kernel.org, linux-nfs@vger.kernel.org, Chaitanya Kulkarni Subject: [PATCH 02/10] fs: allow error returns from generic_update_time Date: Wed, 17 Dec 2025 07:09:35 +0100 Message-ID: <20251217061015.923954-3-hch@lst.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251217061015.923954-1-hch@lst.de> References: <20251217061015.923954-1-hch@lst.de> Precedence: bulk X-Mailing-List: io-uring@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Now that no caller looks at the updated flags, switch generic_update_time to the same calling convention as the ->update_time method and return 0 or a negative errno. This prepares for adding non-blocking timestamp updates that could return -EAGAIN. Signed-off-by: Christoph Hellwig Reviewed-by: Jan Kara Reviewed-by: Chaitanya Kulkarni Reviewed-by: Jeff Layton --- fs/gfs2/inode.c | 3 +-- fs/inode.c | 4 ++-- fs/ubifs/file.c | 6 ++---- fs/xfs/xfs_iops.c | 6 ++---- include/linux/fs.h | 2 +- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index 36618e353199..e08eb419347c 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -2257,8 +2257,7 @@ static int gfs2_update_time(struct inode *inode, int flags) if (error) return error; } - generic_update_time(inode, flags); - return 0; + return generic_update_time(inode, flags); } static const struct inode_operations gfs2_file_iops = { diff --git a/fs/inode.c b/fs/inode.c index 07effa0cb999..7eb28dd45a5a 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -2141,7 +2141,7 @@ EXPORT_SYMBOL(inode_update_timestamps); * or S_VERSION need to be updated we attempt to update all three of them. S_ATIME * updates can be handled done independently of the rest. * - * Returns a S_* mask indicating which fields were updated. + * Returns a negative error value on error, else 0. */ int generic_update_time(struct inode *inode, int flags) { @@ -2153,7 +2153,7 @@ int generic_update_time(struct inode *inode, int flags) if (updated & S_VERSION) dirty_flags |= I_DIRTY_SYNC; __mark_inode_dirty(inode, dirty_flags); - return updated; + return 0; } EXPORT_SYMBOL(generic_update_time); diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c index c3265b8804f5..ec1bb9f43acc 100644 --- a/fs/ubifs/file.c +++ b/fs/ubifs/file.c @@ -1379,10 +1379,8 @@ int ubifs_update_time(struct inode *inode, int flags) .dirtied_ino_d = ALIGN(ui->data_len, 8) }; int err, release; - if (!IS_ENABLED(CONFIG_UBIFS_ATIME_SUPPORT)) { - generic_update_time(inode, flags); - return 0; - } + if (!IS_ENABLED(CONFIG_UBIFS_ATIME_SUPPORT)) + return generic_update_time(inode, flags); err = ubifs_budget_space(c, &req); if (err) diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index ad94fbf55014..9dedb54e3cb0 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c @@ -1197,10 +1197,8 @@ xfs_vn_update_time( if (inode->i_sb->s_flags & SB_LAZYTIME) { if (!((flags & S_VERSION) && - inode_maybe_inc_iversion(inode, false))) { - generic_update_time(inode, flags); - return 0; - } + inode_maybe_inc_iversion(inode, false))) + return generic_update_time(inode, flags); /* Capture the iversion update that just occurred */ log_flags |= XFS_ILOG_CORE; diff --git a/include/linux/fs.h b/include/linux/fs.h index ee623c16d835..fccb0a38cb74 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2399,7 +2399,7 @@ extern void ihold(struct inode * inode); extern void iput(struct inode *); void iput_not_last(struct inode *); int inode_update_timestamps(struct inode *inode, int flags); -int generic_update_time(struct inode *, int); +int generic_update_time(struct inode *inode, int flags); /* /sys/fs */ extern struct kobject *fs_kobj; -- 2.47.3