From 1284ecd57375f9e34ce738cae4ece834995f275d Mon Sep 17 00:00:00 2001 From: Siddharth Chintamaneni Date: Sat, 31 Oct 2026 23:00:49 -0700 Subject: [PATCH] fs: use must_set_pos() in default_llseek() default_llseek() open-codes the same whence switch for SEEK_END, SEEK_CUR, SEEK_DATA, and SEEK_HOLE that must_set_pos() already implements for generic_file_llseek_size() and generic_llseek_cookie(). Replace the open-coded switch (whence) block in default_llseek() with a call to must_set_pos(file, &offset, whence, i_size_read(inode)). Signed-off-by: Siddharth Chintamaneni Link: https://patch.msgid.link/20261101060049.81441-3-sidchintamaneni@gmail.com Reviewed-by: Jan Kara Signed-off-by: Christian Brauner (Amutable) --- fs/read_write.c | 50 ++++++++++++++----------------------------------- 1 file changed, 14 insertions(+), 36 deletions(-) diff --git a/fs/read_write.c b/fs/read_write.c index 86ce8cea10d7..b15522cf96cd 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -333,47 +333,25 @@ loff_t default_llseek(struct file *file, loff_t offset, int whence) { struct inode *inode = file_inode(file); loff_t retval; - loff_t eof; + int ret; retval = inode_lock_killable(inode); if (retval) return retval; - eof = i_size_read(inode); - switch (whence) { - case SEEK_END: - offset += eof; - break; - case SEEK_CUR: - if (offset == 0) { - retval = file->f_pos; - goto out; - } - offset += file->f_pos; - break; - case SEEK_DATA: - /* - * In the generic case the entire file is data, so as - * long as offset isn't at the end of the file then the - * offset is data. - */ - if ((unsigned long long)offset >= eof) { - retval = -ENXIO; - goto out; - } - break; - case SEEK_HOLE: - /* - * There is a virtual hole at the end of the file, so - * as long as offset isn't i_size or larger, return - * i_size. - */ - if ((unsigned long long)offset >= eof) { - retval = -ENXIO; - goto out; - } - offset = eof; - break; + + ret = must_set_pos(file, &offset, whence, i_size_read(inode)); + if (ret < 0) { + retval = ret; + goto out; } + if (ret == 0) { + retval = offset; + goto out; + } + + if (whence == SEEK_CUR) + offset += file->f_pos; + retval = -EINVAL; if (offset >= 0 || unsigned_offsets(file)) { if (offset != file->f_pos)