[1/2] exfat stopusing CONFIG_FAT_DEFAULT_IOCHARSET

Message ID 20190906150917.1025250-1-arnd@arndb.de
State Accepted
Commit 26cf7660919e4f0b2cf26d0ea6c95f58cbbd7ec7
Headers show
Series
  • [1/2] exfat stopusing CONFIG_FAT_DEFAULT_IOCHARSET
Related show

Commit Message

Arnd Bergmann Sept. 6, 2019, 3:09 p.m.
When CONFIG_VFAT_FS is disabled, the reference to CONFIG_FAT_DEFAULT_IOCHARSET
causes a link failure:

drivers/staging/exfat/exfat_super.c:46:41: error: use of undeclared identifier 'CONFIG_FAT_DEFAULT_IOCHARSET'
static char exfat_default_iocharset[] = CONFIG_FAT_DEFAULT_IOCHARSET;

I could not figure out why the correct code is commented
out, but using that fixes the problem.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 drivers/staging/exfat/exfat_super.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

-- 
2.20.0

Comments

Greg KH Sept. 6, 2019, 4:18 p.m. | #1
On Fri, Sep 06, 2019 at 05:09:04PM +0200, Arnd Bergmann wrote:
> When CONFIG_VFAT_FS is disabled, the reference to CONFIG_FAT_DEFAULT_IOCHARSET

> causes a link failure:

> 

> drivers/staging/exfat/exfat_super.c:46:41: error: use of undeclared identifier 'CONFIG_FAT_DEFAULT_IOCHARSET'

> static char exfat_default_iocharset[] = CONFIG_FAT_DEFAULT_IOCHARSET;

> 

> I could not figure out why the correct code is commented

> out, but using that fixes the problem.


For some reason I was getting a build error without that, I added those
commented out lines.  Odd.  Oh well, thanks for fixing this :)

greg k-h

Patch

diff --git a/drivers/staging/exfat/exfat_super.c b/drivers/staging/exfat/exfat_super.c
index 3934b120e1dd..37e78620723f 100644
--- a/drivers/staging/exfat/exfat_super.c
+++ b/drivers/staging/exfat/exfat_super.c
@@ -39,11 +39,8 @@ 
 
 static struct kmem_cache *exfat_inode_cachep;
 
-// FIXME use commented lines
-// static int exfat_default_codepage = CONFIG_EXFAT_DEFAULT_CODEPAGE;
-// static char exfat_default_iocharset[] = CONFIG_EXFAT_DEFAULT_IOCHARSET;
-static int exfat_default_codepage = CONFIG_FAT_DEFAULT_CODEPAGE;
-static char exfat_default_iocharset[] = CONFIG_FAT_DEFAULT_IOCHARSET;
+static int exfat_default_codepage = CONFIG_EXFAT_DEFAULT_CODEPAGE;
+static char exfat_default_iocharset[] = CONFIG_EXFAT_DEFAULT_IOCHARSET;
 
 #define INC_IVERSION(x) (inode_inc_iversion(x))
 #define GET_IVERSION(x) (inode_peek_iversion_raw(x))