diff options
| author | Christoph Hellwig <hch@lst.de> | 2026-01-08 15:19:02 +0100 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2026-01-12 14:01:32 +0100 |
| commit | dc9629faef0a3d3cd35aff22806376700275a8b6 (patch) | |
| tree | 8009babba2db708fde61e03102a3b611f7e5d7d9 | |
| parent | 20b781834ea0037b63c657e15b5aa4cfb4dd9b8b (diff) | |
fs: allow error returns from generic_update_time
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 <hch@lst.de>
Link: https://patch.msgid.link/20260108141934.2052404-3-hch@lst.de
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>
| -rw-r--r-- | fs/gfs2/inode.c | 3 | ||||
| -rw-r--r-- | fs/inode.c | 4 | ||||
| -rw-r--r-- | fs/ubifs/file.c | 6 | ||||
| -rw-r--r-- | fs/xfs/xfs_iops.c | 6 | ||||
| -rw-r--r-- | 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 294e4c0b5aa8..0983df0d0705 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; |