torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

ocfs2: store cookie in private data

Browse Source 
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-13-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>
This commit is contained in:
Christian Brauner 2024-08-30 15:04:54 +02:00
parent 7a7ce8b3ba
commit ceaa5e80db
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/ocfs2/dir.c
View File

@ -1932,6 +1932,7 @@ int ocfs2_readdir(struct file *file, struct dir_context *ctx)
{ {
int error = 0; int error = 0;
struct inode *inode = file_inode(file); struct inode *inode = file_inode(file);
struct ocfs2_file_private *fp = file->private_data;
int lock_level = 0; int lock_level = 0;
trace_ocfs2_readdir((unsigned long long)OCFS2_I(inode)->ip_blkno); trace_ocfs2_readdir((unsigned long long)OCFS2_I(inode)->ip_blkno);
@ -1952,7 +1953,7 @@ int ocfs2_readdir(struct file *file, struct dir_context *ctx)
goto bail_nolock; goto bail_nolock;
} }
error = ocfs2_dir_foreach_blk(inode, &file->f_version, ctx, false); error = ocfs2_dir_foreach_blk(inode, &fp->cookie, ctx, false);
ocfs2_inode_unlock(inode, lock_level); ocfs2_inode_unlock(inode, lock_level);
if (error) if (error)

11
fs/ocfs2/file.c
View File

@ -2750,6 +2750,13 @@ out_unlock:
return remapped > 0 ? remapped : ret; return remapped > 0 ? remapped : ret;
} }
static loff_t ocfs2_dir_llseek(struct file *file, loff_t offset, int whence)
{
struct ocfs2_file_private *fp = file->private_data;
return generic_llseek_cookie(file, offset, whence, &fp->cookie);
}
const struct inode_operations ocfs2_file_iops = { const struct inode_operations ocfs2_file_iops = {
.setattr = ocfs2_setattr, .setattr = ocfs2_setattr,
.getattr = ocfs2_getattr, .getattr = ocfs2_getattr,
@ -2797,7 +2804,7 @@ const struct file_operations ocfs2_fops = {
WRAP_DIR_ITER(ocfs2_readdir) // FIXME! WRAP_DIR_ITER(ocfs2_readdir) // FIXME!
const struct file_operations ocfs2_dops = { const struct file_operations ocfs2_dops = {
.llseek = generic_file_llseek, .llseek = ocfs2_dir_llseek,
.read = generic_read_dir, .read = generic_read_dir,
.iterate_shared = shared_ocfs2_readdir, .iterate_shared = shared_ocfs2_readdir,
.fsync = ocfs2_sync_file, .fsync = ocfs2_sync_file,
@ -2843,7 +2850,7 @@ const struct file_operations ocfs2_fops_no_plocks = {
}; };
const struct file_operations ocfs2_dops_no_plocks = { const struct file_operations ocfs2_dops_no_plocks = {
.llseek = generic_file_llseek, .llseek = ocfs2_dir_llseek,
.read = generic_read_dir, .read = generic_read_dir,
.iterate_shared = shared_ocfs2_readdir, .iterate_shared = shared_ocfs2_readdir,
.fsync = ocfs2_sync_file, .fsync = ocfs2_sync_file,

1
fs/ocfs2/file.h
View File

@ -20,6 +20,7 @@ struct ocfs2_alloc_context;
enum ocfs2_alloc_restarted; enum ocfs2_alloc_restarted;
struct ocfs2_file_private { struct ocfs2_file_private {
u64 cookie;
struct file *fp_file; struct file *fp_file;
struct mutex fp_mutex; struct mutex fp_mutex;
struct ocfs2_lock_res fp_flock; struct ocfs2_lock_res fp_flock;