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 1FF453009E1; Thu, 20 Nov 2025 06:50:12 +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=1763621414; cv=none; b=dshRHTv6dFnhOzfwUk5zEWFeWuP4kcvWehYLzoJ97DsLYU0QoTpsDnrWDF7pnHKaCSQjpL8LAt4Hy9IaJSNcmh9AJy6KYnBJI1Nw9VCErtILWX5UHMG6+zlXusZ3vKvDqR7yL/47liaJysI2NDTRpLFinRTvDm/ySevFHrcnhOY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763621414; c=relaxed/simple; bh=ov6/8riiDS++KAGomyXztVUrCUJy9AVgwoQlpowjP5Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=olDw3bBAwiflKXSJQvzJWY1SovQR9Ee7wQB2CybnQKQLpRFjPwIi1LwekDp2Q1mFH47wYlgxMJTuSUto8Wb9K3tVTjlB/ji3mcM6HSCqQapEy0YmvPQu4mlEqcSjWsb+f4IewLau4fhOH533tPWrqhAK6cf58MHGKTEfBvJQI1w= 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=e0G0hxIf; 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="e0G0hxIf" 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=wMW4zxVheIl0RFcxhdH0Lmj7v+a7bd/DZzv0A/zYMRE=; b=e0G0hxIfnNTt4jMNnQsTruhf26 pPHwC+fgoWXXP8U8st2ONeyjYRU+3IM2gqWPYDcbT8q3rXSjrdbli6dV2t/2jryDi9mHojpom8xIN xpJ23CkpvPrVyFIw6QNwQyAHvPe/oEJABRd8JeQpq80iocASjVPyJbjkbwd2DcPUuZZ35YDIxzeYp jCcm1du8jh4BGEFzz0OXx5YEs4R5HyvVfebDRe6LiNxY+8vg9l0wF+4miF+i5BciHrew88H1IhKPw iqQGRy5rI2MOVxeiPKK5HkjIKCV5uBYURc1uBWU1kPdmqa965JB2UlP3my4feIkXN49dea6QlRWyU Jkn+42cQ==; 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 1vLyUc-00000006EwY-0Fvl; Thu, 20 Nov 2025 06:50:10 +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 08/16] fs: allow error returns from generic_update_time Date: Thu, 20 Nov 2025 07:47:29 +0100 Message-ID: <20251120064859.2911749-9-hch@lst.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251120064859.2911749-1-hch@lst.de> References: <20251120064859.2911749-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: 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 8a7ed80d9f2d..601c14a3ac77 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -2242,8 +2242,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 6e7e42915376..15a8b2cf78ef 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -2103,7 +2103,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) { @@ -2115,7 +2115,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 ca41ce8208c4..3e119cb93ea9 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 caff0125faea..0ace5f790006 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 b54d300285b0..4759aa61cb14 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2825,7 +2825,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