summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-02-08 04:52:38 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2020-02-08 04:52:38 +0300
commit60ea27e936f2b9b7f011644a499c292f9cc11de3 (patch)
treef09f6096285594125d6dfef6cc3c041c83d0567e /fs
parent08dffcc7d94b7751663f1b0d66b45ff3a98375a2 (diff)
parent9f198a2ac543eaaf47be275531ad5cbd50db3edf (diff)
downloadlinux-60ea27e936f2b9b7f011644a499c292f9cc11de3.tar.xz
Merge tag 'for-linus-5.6-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux
Pull orangefs fix from Mike Marshall: "Debugfs fix for orangefs. Vasliy Averin noticed that 'if seq_file .next function does not change position index, read after some lseek can generate unexpected output' and sent in this fix" * tag 'for-linus-5.6-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux: help_next should increase position index
Diffstat (limited to 'fs')
-rw-r--r--fs/orangefs/orangefs-debugfs.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/orangefs/orangefs-debugfs.c b/fs/orangefs/orangefs-debugfs.c
index 25543a966c48..29eaa4544372 100644
--- a/fs/orangefs/orangefs-debugfs.c
+++ b/fs/orangefs/orangefs-debugfs.c
@@ -273,6 +273,7 @@ static void *help_start(struct seq_file *m, loff_t *pos)
static void *help_next(struct seq_file *m, void *v, loff_t *pos)
{
+ (*pos)++;
gossip_debug(GOSSIP_DEBUGFS_DEBUG, "help_next: start\n");
return NULL;