Skip to content

Commit 99b319d

Browse files
author
Jonathan Corbet
committed
docs: vfs: clean up after the iterate() removal
Commit 3e32715 ("vfs: get rid of old '->iterate' directory operation") removed the iterate() file_operations member, but neglected to clean up the associated documentation. Get rid of the leftovers. Link: https://lore.kernel.org/r/874jl945bv.fsf@meer.lwn.net Reviewed-by: Christian Brauner <brauner@kernel.org> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
1 parent ad93f08 commit 99b319d

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

Documentation/filesystems/locking.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,6 @@ prototypes::
509509
ssize_t (*read_iter) (struct kiocb *, struct iov_iter *);
510510
ssize_t (*write_iter) (struct kiocb *, struct iov_iter *);
511511
int (*iopoll) (struct kiocb *kiocb, bool spin);
512-
int (*iterate) (struct file *, struct dir_context *);
513512
int (*iterate_shared) (struct file *, struct dir_context *);
514513
__poll_t (*poll) (struct file *, struct poll_table_struct *);
515514
long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);

Documentation/filesystems/vfs.rst

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,7 +1074,6 @@ This describes how the VFS can manipulate an open file. As of kernel
10741074
ssize_t (*read_iter) (struct kiocb *, struct iov_iter *);
10751075
ssize_t (*write_iter) (struct kiocb *, struct iov_iter *);
10761076
int (*iopoll)(struct kiocb *kiocb, bool spin);
1077-
int (*iterate) (struct file *, struct dir_context *);
10781077
int (*iterate_shared) (struct file *, struct dir_context *);
10791078
__poll_t (*poll) (struct file *, struct poll_table_struct *);
10801079
long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
@@ -1126,12 +1125,8 @@ otherwise noted.
11261125
``iopoll``
11271126
called when aio wants to poll for completions on HIPRI iocbs
11281127

1129-
``iterate``
1130-
called when the VFS needs to read the directory contents
1131-
11321128
``iterate_shared``
1133-
called when the VFS needs to read the directory contents when
1134-
filesystem supports concurrent dir iterators
1129+
called when the VFS needs to read the directory contents
11351130

11361131
``poll``
11371132
called by the VFS when a process wants to check if there is

0 commit comments

Comments
 (0)