Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ext2: store cookie in private data

Store the cookie to detect concurrent seeks on directories in
file->private_data.

Link: https://lore.kernel.org/r/20240830-vfs-file-f_version-v1-10-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>

+25 -3
+25 -3
fs/ext2/dir.c
··· 263 263 unsigned long n = pos >> PAGE_SHIFT; 264 264 unsigned long npages = dir_pages(inode); 265 265 unsigned chunk_mask = ~(ext2_chunk_size(inode)-1); 266 - bool need_revalidate = !inode_eq_iversion(inode, file->f_version); 266 + bool need_revalidate = !inode_eq_iversion(inode, *(u64 *)file->private_data); 267 267 bool has_filetype; 268 268 269 269 if (pos > inode->i_size - EXT2_DIR_REC_LEN(1)) ··· 290 290 offset = ext2_validate_entry(kaddr, offset, chunk_mask); 291 291 ctx->pos = (n<<PAGE_SHIFT) + offset; 292 292 } 293 - file->f_version = inode_query_iversion(inode); 293 + *(u64 *)file->private_data = inode_query_iversion(inode); 294 294 need_revalidate = false; 295 295 } 296 296 de = (ext2_dirent *)(kaddr+offset); ··· 703 703 return 0; 704 704 } 705 705 706 + static int ext2_dir_open(struct inode *inode, struct file *file) 707 + { 708 + file->private_data = kzalloc(sizeof(u64), GFP_KERNEL); 709 + if (!file->private_data) 710 + return -ENOMEM; 711 + return 0; 712 + } 713 + 714 + static int ext2_dir_release(struct inode *inode, struct file *file) 715 + { 716 + kfree(file->private_data); 717 + return 0; 718 + } 719 + 720 + static loff_t ext2_dir_llseek(struct file *file, loff_t offset, int whence) 721 + { 722 + return generic_llseek_cookie(file, offset, whence, 723 + (u64 *)file->private_data); 724 + } 725 + 706 726 const struct file_operations ext2_dir_operations = { 707 - .llseek = generic_file_llseek, 727 + .open = ext2_dir_open, 728 + .release = ext2_dir_release, 729 + .llseek = ext2_dir_llseek, 708 730 .read = generic_read_dir, 709 731 .iterate_shared = ext2_readdir, 710 732 .unlocked_ioctl = ext2_ioctl,