ocfs2: Use regular seq_show_option for osb_cluster_stack
PATCH 1/1 ocfs2: Use regular seq_show_option for osb_cluster_stack
While cleaning up seq_show_option_n()'s use of strncpy, it was noticed that the osb_cluster_stack member is always NUL-terminated, so there is no need to use the special seq_show_option_n() routine. Replace it with the standard seq_show_option() routine.
Cc Mark Fasheh <[email protected]>
Cc Joel Becker <[email protected]>
Cc Joseph Qi <[email protected]>
Cc Andy Shevchenko <[email protected]>
Signed-off-by Kees Cook <[email protected]>
---
--- fs/ocfs2/super.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/ocfs2/super.c +1 -2
@@ -1517,8 +1517,7 @@ static int ocfs2_show_options(struct seq_file *s, struct dentry *root)seq_printf (s,",localflocks," );if (osb->osb_cluster_stack[0 ]) -seq_show_option_n (s,"cluster_stack" , osb->osb_cluster_stack, -OCFS2_STACK_LABEL_LEN ); +seq_show_option (s,"cluster_stack" , osb->osb_cluster_stack);if (opts &OCFS2_MOUNT_USRQUOTA )seq_printf (s,",usrquota" );if (opts &OCFS2_MOUNT_GRPQUOTA )
Signature · 1 line
2.34.1
Quoted 11 lines · Kees Cook
While cleaning up seq_show_option_n()'s use of strncpy, it was noticed that the
osb_cluster_stackmember is always NUL-terminated, so there is no need to use the specialseq_show_option_n()routine. Replace it with the standardseq_show_option()routine.Cc Mark Fasheh <[email protected]>Cc Joel Becker <[email protected]>Cc Joseph Qi <[email protected]>Cc Andy Shevchenko <[email protected]>Signed-off-by Kees Cook <[email protected]>
Looks good.
Reviewed-by Joseph Qi <[email protected]>
Quoted 19 lines
---
--- fs/ocfs2/super.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)fs/ocfs2/super.c +1
-2@@ -1517,8 +1517,7 @@ static int ocfs2_show_options(struct seq_file *s, struct dentry *root)seq_printf (s,",localflocks," );if (osb->osb_cluster_stack[0 ]) -seq_show_option_n (s,"cluster_stack" , osb->osb_cluster_stack, -OCFS2_STACK_LABEL_LEN ); +seq_show_option (s,"cluster_stack" , osb->osb_cluster_stack);if (opts &OCFS2_MOUNT_USRQUOTA )seq_printf (s,",usrquota" );if (opts &OCFS2_MOUNT_GRPQUOTA )