Skip to contentSkip to conversation

isofs: fix build regression

PATCH New Arnd Bergmann 1 participant 1 message Sep 16, 2017 Isofs filesystem

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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")
---
 fs/isofs/inode.c | 2 ++
 1 file changed, 2 insertions(+)
fs/isofs/inode.c +2 -0
index 6fa7c4dbc200..bc258a4402f6 100644
@@ -514,9 +514,11 @@ static int isofs_show_options(struct seq_file *m, struct dentry *root)
 	if (sbi->s_fmode != ISOFS_INVALID_MODE)
 		seq_printf(m, ",fmode=%o", sbi->s_fmode);
 
+#ifdef CONFIG_JOLIET
 	if (sbi->s_nls_iocharset &&
 	    strcmp(sbi->s_nls_iocharset->charset, CONFIG_NLS_DEFAULT) != 0)
 		seq_printf(m, ",iocharset=%s", sbi->s_nls_iocharset->charset);
+#endif
 	return 0;
 }
 
Signature · 1 line
2.9.0