The patch 1 make load_nls() take a const char * as parameter so we can reuse a nls's name without cast: ses->local_nls = load_nls(ctx->local_nls->charset); The patch 2 do the charset fix in cifs. -- Winston Wen (2): fs/nls: make load_nls() take a const parameter cifs: fix charset issue in reconnection fs/nls/nls_base.c | 4 ++-- fs/smb/client/cifsglob.h | 1 + fs/smb/client/cifssmb.c | 3 +-- fs/smb/client/connect.c | 5 +++++ fs/smb/client/misc.c | 1 + fs/smb/client/smb2pdu.c | 3 +-- include/linux/nls.h | 2 +- 7 files changed, 12 insertions(+), 7 deletions(-)