Skip to content

Commit

Permalink
Fix buggy procfs_list_seq_next warning
Browse files Browse the repository at this point in the history
The kernel seq_read() helper function expects ->next() to update
the passed position even there are no more entries.  Failure to
do so results in the following warning being logged.

    seq_file: buggy .next function procfs_list_seq_next [spl]
    did not update position index

Functionally there is no issue with the way procfs_list_seq_next()
is implemented and the warning is harmless.  However, we want to
silence this some what scary incorrect warning.  This commit
updates the Linux procfs code to advance the position even for
the last entry.

Reviewed-by: Tony Hutter <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes openzfs#10984 
Closes openzfs#10996
  • Loading branch information
behlendorf authored and jsai20 committed Mar 30, 2021
1 parent 45fb507 commit a955f91
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions module/os/linux/spl/spl-procfs-list.c
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,17 @@ procfs_list_next_node(procfs_list_cursor_t *cursor, loff_t *pos)
cursor->cached_node = next_node;
cursor->cached_pos = NODE_ID(procfs_list, cursor->cached_node);
*pos = cursor->cached_pos;
} else {
/*
* seq_read() expects ->next() to update the position even
* when there are no more entries. Advance the position to
* prevent a warning from being logged.
*/
cursor->cached_node = NULL;
cursor->cached_pos++;
*pos = cursor->cached_pos;
}

return (next_node);
}

Expand All @@ -105,6 +115,8 @@ procfs_list_seq_start(struct seq_file *f, loff_t *pos)
cursor->cached_node = SEQ_START_TOKEN;
cursor->cached_pos = 0;
return (SEQ_START_TOKEN);
} else if (cursor->cached_node == NULL) {
return (NULL);
}

/*
Expand Down

0 comments on commit a955f91

Please sign in to comment.