Commit 531d3b5f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-6.1-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux 

Pull orangefs update from Mike Marshall:
 "Change iterate to iterate_shared"

* tag 'for-linus-6.1-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
  Orangefs: change iterate to iterate_shared
parents a185a099 2ad4b6f5

fs/orangefs/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ static int orangefs_dir_release(struct inode *inode, struct file *file) 
const struct file_operations orangefs_dir_operations = {

	.llseek = orangefs_dir_llseek,

	.read = generic_read_dir,

	.iterate = orangefs_dir_iterate,

	.iterate_shared = orangefs_dir_iterate,

	.open = orangefs_dir_open,

	.release = orangefs_dir_release

};