Skip to content

Commit 0ab0b27

Browse files
arndbjankara
authored andcommitted
isofs: fix build regression
The new isofs_show_options() function fails to build when CONFIG_NLS is disabled: fs/isofs/inode.c: In function 'isofs_show_options': fs/isofs/inode.c:518:44: error: 'CONFIG_NLS_DEFAULT' undeclared (first use in this function) fs/isofs/inode.c:518:44: note: each undeclared identifier is reported only once for each function it appears in This adds a check for CONFIG_JOLIET (which selects NLS), matching the other uses of the iocharset handling in this file. Fixes: 6fecb86a44f5 ("isofs: Implement show_options") Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Jan Kara <[email protected]>
1 parent 0a51fb7 commit 0ab0b27

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

fs/isofs/inode.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -514,9 +514,11 @@ static int isofs_show_options(struct seq_file *m, struct dentry *root)
514514
if (sbi->s_fmode != ISOFS_INVALID_MODE)
515515
seq_printf(m, ",fmode=%o", sbi->s_fmode);
516516

517+
#ifdef CONFIG_JOLIET
517518
if (sbi->s_nls_iocharset &&
518519
strcmp(sbi->s_nls_iocharset->charset, CONFIG_NLS_DEFAULT) != 0)
519520
seq_printf(m, ",iocharset=%s", sbi->s_nls_iocharset->charset);
521+
#endif
520522
return 0;
521523
}
522524

0 commit comments

Comments
 (0)