aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorChristian Brauner <brauner@kernel.org>2024-08-30 15:05:01 +0200
committerChristian Brauner <brauner@kernel.org>2024-09-12 11:58:45 +0200
commit11068e0b64cbb540b96e577fcca0926242ecaf58 (patch)
treed071e54a8009b45461848dc550e0ee4800297b92 /fs
parent5a957bbac3ab9808a8df711a269e4d18f84e9e4a (diff)
fs: remove f_version
Now that detecting concurrent seeks is done by the filesystems that require it we can remove f_version and free up 8 bytes for future extensions. Link: https://lore.kernel.org/r/20240830-vfs-file-f_version-v1-20-6d3e4816aa7b@kernel.org Reviewed-by: Jan Kara <jack@suse.cz> Reviewed-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/read_write.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/read_write.c b/fs/read_write.c
index fb519e55c8e8..b19cce8e55b9 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -62,7 +62,8 @@ static loff_t vfs_setpos_cookie(struct file *file, loff_t offset,
if (offset != file->f_pos) {
file->f_pos = offset;
- *cookie = 0;
+ if (cookie)
+ *cookie = 0;
}
return offset;
}
@@ -81,7 +82,7 @@ static loff_t vfs_setpos_cookie(struct file *file, loff_t offset,
*/
loff_t vfs_setpos(struct file *file, loff_t offset, loff_t maxsize)
{
- return vfs_setpos_cookie(file, offset, maxsize, &file->f_version);
+ return vfs_setpos_cookie(file, offset, maxsize, NULL);
}
EXPORT_SYMBOL(vfs_setpos);
@@ -364,10 +365,8 @@ loff_t default_llseek(struct file *file, loff_t offset, int whence)
}
retval = -EINVAL;
if (offset >= 0 || unsigned_offsets(file)) {
- if (offset != file->f_pos) {
+ if (offset != file->f_pos)
file->f_pos = offset;
- file->f_version = 0;
- }
retval = offset;
}
out: