summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-10-13 09:56:14 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2022-10-13 09:56:14 -0700
commit531d3b5f731123a1ea91887a84f99bb8cb64be8e (patch)
tree730846ebe0b57b4fa53335b2475a253841f963ba /fs
parenta185a0995518a3355c8623c95c36aaaae489de10 (diff)
parent2ad4b6f5e1179f3879b6d4392070039e32ce55a3 (diff)
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
Diffstat (limited to 'fs')
-rw-r--r--fs/orangefs/dir.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/orangefs/dir.c b/fs/orangefs/dir.c
index e2c2699d8016..9cacce5d55c1 100644
--- a/fs/orangefs/dir.c
+++ b/fs/orangefs/dir.c
@@ -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
};