From patchwork Mon Jul 24 02:10:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Winston Wen X-Patchwork-Id: 1811502 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-cifs-owner@vger.kernel.org; receiver=) Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by legolas.ozlabs.org (Postfix) with ESMTP id 4R8P8b0sjDz1yYc for ; Mon, 24 Jul 2023 12:23:11 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229832AbjGXCXH (ORCPT ); Sun, 23 Jul 2023 22:23:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231802AbjGXCXB (ORCPT ); Sun, 23 Jul 2023 22:23:01 -0400 Received: from smtpbgeu2.qq.com (smtpbgeu2.qq.com [18.194.254.142]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81921180; Sun, 23 Jul 2023 19:22:49 -0700 (PDT) X-QQ-mid: bizesmtp78t1690164714tc9b5fmw Received: from localhost.localdomain ( [113.57.152.160]) by bizesmtp.qq.com (ESMTP) with id ; Mon, 24 Jul 2023 10:11:53 +0800 (CST) X-QQ-SSF: 01400000000000F0I000000A0000000 X-QQ-FEAT: SFhf6fKhx//3yTay0+eQ1D+CKKeJtzJ6HaCq9pMrGhb8UPerUVao+UuD5kIip lL/PYV/QIGEXFgV+1O16DTphm6WGyKJap0KhiXLDOZBPEQ98qzlHcPNq4PjyN+7EBpurmj6 VR7hFD0g8LWUkFgs5el/o/M3DIdpH0ZRsYybLpHcrcTyjZAuiMYZhjI2V2H1O/C4pF2BiCZ TDknNgiFf65NuW7WxNODlePQTgYLocjNnGN1/ikAmS4saFysEYRc4yaEhgqTbrp7y4wSQAN Cx+/mT0fPuXQ1f7lGyLKfBCa4tbqWBSJMd0XchQuHdzdgJV0fI7QN3cJT7FD28l+ALQ5OJO 99tKVrxgEcRK/it0pOoMU0BX6JP2JoSgoEji/JB0q/krdKRGJc= X-QQ-GoodBg: 1 X-BIZMAIL-ID: 10104321948773929990 From: Winston Wen To: Steve French , Alexander Viro , Christian Brauner , linux-cifs@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 0/2] cifs: fix charset issue in reconnection Date: Mon, 24 Jul 2023 10:10:55 +0800 Message-Id: <20230724021057.2958991-1-wentao@uniontech.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:uniontech.com:qybglogicsvrgz:qybglogicsvrgz6a-1 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_HELO_TEMPERROR autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org 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(-)