{"id":2219179,"url":"http://patchwork.ozlabs.org/api/1.0/patches/2219179/?format=json","project":{"id":12,"url":"http://patchwork.ozlabs.org/api/1.0/projects/12/?format=json","name":"Linux CIFS Client","link_name":"linux-cifs-client","list_id":"linux-cifs.vger.kernel.org","list_email":"linux-cifs@vger.kernel.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260402141839.461257-5-huiwen.he@linux.dev>","date":"2026-04-02T14:18:30","name":"[v3,04/13] smb/client: refactor ntstatus_to_dos() to return mapping entry","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"d0af07c304e634e16473071eb922b83008eff097","submitter":{"id":93029,"url":"http://patchwork.ozlabs.org/api/1.0/people/93029/?format=json","name":null,"email":"huiwen.he@linux.dev"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-cifs-client/patch/20260402141839.461257-5-huiwen.he@linux.dev/mbox/","series":[{"id":498490,"url":"http://patchwork.ozlabs.org/api/1.0/series/498490/?format=json","date":"2026-04-02T14:18:28","name":"smb: improve search speed of SMB1 maperror","version":3,"mbox":"http://patchwork.ozlabs.org/series/498490/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2219179/checks/","tags":{},"headers":{"Return-Path":"\n ","X-Original-To":["incoming@patchwork.ozlabs.org","linux-cifs@vger.kernel.org"],"Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256\n header.s=key1 header.b=s9d2Cz2Y;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=172.234.253.10; helo=sea.lore.kernel.org;\n envelope-from=linux-cifs+bounces-10637-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)","smtp.subspace.kernel.org;\n\tdkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev\n header.b=\"s9d2Cz2Y\"","smtp.subspace.kernel.org;\n arc=none smtp.client-ip=91.218.175.184","smtp.subspace.kernel.org;\n dmarc=pass (p=none dis=none) header.from=linux.dev","smtp.subspace.kernel.org;\n spf=pass smtp.mailfrom=linux.dev"],"Received":["from sea.lore.kernel.org (sea.lore.kernel.org [172.234.253.10])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fmkgn2GRNz1yCs\n\tfor ; Fri, 03 Apr 2026 01:26:45 +1100 (AEDT)","from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby sea.lore.kernel.org (Postfix) with ESMTP id 914F230AC291\n\tfor ; Thu, 2 Apr 2026 14:20:03 +0000 (UTC)","from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id 4F96F3E557D;\n\tThu, 2 Apr 2026 14:19:59 +0000 (UTC)","from out-184.mta0.migadu.com (out-184.mta0.migadu.com\n [91.218.175.184])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id 1527F3ECBDD\n\tfor ; Thu, 2 Apr 2026 14:19:55 +0000 (UTC)"],"ARC-Seal":"i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1775139599; cv=none;\n b=iXmzpABSVUrnYgWB1oCbzxNEkWI0VsukPlEjvP/BpSdDiKwsFandbwAtsMTT85SlKHusZZjM6ejn0vcwjFSShDNrVAcn1ZuTV47D2KZLW6PHenQPPlYVsr/wtIuubrgMCD8HKDpoxzxf0KC5ZP+RhJM+ojHyV5V40Q3FlWC+ni4=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1775139599; c=relaxed/simple;\n\tbh=oecBMrrXzvYW2yJECRvMj2NetT6ctELjdS/D2FGgPuU=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version;\n b=TTIQ9jWEc6kUWA8imQFA5dI/wriU8FoYbfMS9FRbw5baSBjfnlo4ARROhD0Hhk8xGL2DNVQ4y9V6CtjyCvXGbSN/6nPe4PP7MPTCSBSM0ZaIqzd/XHKkM3TrdV2ICXXhQPe8YlAWbqRH29TkdF7q3AFFIG+y8ALNNeKMedVpeCw=","ARC-Authentication-Results":"i=1; smtp.subspace.kernel.org;\n dmarc=pass (p=none dis=none) header.from=linux.dev;\n spf=pass smtp.mailfrom=linux.dev;\n dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev\n header.b=s9d2Cz2Y; arc=none smtp.client-ip=91.218.175.184","X-Report-Abuse":"Please report any abuse attempt to abuse@migadu.com and\n include these headers.","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1;\n\tt=1775139593;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\t to:to:cc:cc:mime-version:mime-version:\n\t content-transfer-encoding:content-transfer-encoding:\n\t in-reply-to:in-reply-to:references:references;\n\tbh=6IlUzCa85GYyyzHpAhPEcf7kpIRojhkT+HSS61meg9s=;\n\tb=s9d2Cz2YVLWuGjTeh2t+QVWv6FRSDZFcJI24grWdKhlGk/Dj9Notg4Mzb1tk5sdx9NmHPd\n\t1qiNpHFW4ZYj4pYmHyEI8Y0tm/nZKBHBek0bhCSzu48ie6C/uT5CSKlOO4xQeiCuIR0gxJ\n\ttzcKxc2UGjKBPEKDGuZV58vS34olGn4=","From":"huiwen.he@linux.dev","To":"smfrench@gmail.com,\n\tlinkinjeon@kernel.org,\n\tdhowells@redhat.com,\n\tchenxiaosong@kylinos.cn,\n\tchenxiaosong@chenxiaosong.com,\n\ttangyouling@kylinos.cn","Cc":"linux-cifs@vger.kernel.org,\n\tHuiwen He ","Subject":"[PATCH v3 04/13] smb/client: refactor ntstatus_to_dos() to return\n mapping entry","Date":"Thu, 2 Apr 2026 14:18:30 +0000","Message-ID":"<20260402141839.461257-5-huiwen.he@linux.dev>","In-Reply-To":"<20260402141839.461257-1-huiwen.he@linux.dev>","References":"<20260402141839.461257-1-huiwen.he@linux.dev>","Precedence":"bulk","X-Mailing-List":"linux-cifs@vger.kernel.org","List-Id":"","List-Subscribe":"","List-Unsubscribe":"","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Migadu-Flow":"FLOW_OUT"},"content":"From: Huiwen He \n\nRefactor ntstatus_to_dos() to return a pointer to the mapping entry\ninstead of using output parameters. This allows callers to access all\nfields of the entry directly.\n\nIn map_smb_to_linux_error(), integrate the printing logic directly\nto avoid redundant lookups previously performed by cifs_print_status(),\nwhich is now removed.\n\nSigned-off-by: Huiwen He \nReviewed-by: ChenXiaoSong \n---\n fs/smb/client/smb1maperror.c | 51 ++++++++++++++----------------------\n 1 file changed, 19 insertions(+), 32 deletions(-)","diff":"diff --git a/fs/smb/client/smb1maperror.c b/fs/smb/client/smb1maperror.c\nindex 53313b39d1de..c906f233ac64 100644\n--- a/fs/smb/client/smb1maperror.c\n+++ b/fs/smb/client/smb1maperror.c\n@@ -116,41 +116,19 @@ static const struct ntstatus_to_dos_err ntstatus_to_dos_map[] = {\n \t{0, 0, 0, NULL}\n };\n \n-/*****************************************************************************\n- Print an error message from the status code\n- *****************************************************************************/\n-static void\n-cifs_print_status(__u32 status_code)\n-{\n-\tint idx = 0;\n-\n-\twhile (ntstatus_to_dos_map[idx].nt_errstr) {\n-\t\tif (ntstatus_to_dos_map[idx].ntstatus == status_code) {\n-\t\t\tpr_notice(\"Status code returned 0x%08x %s\\n\",\n-\t\t\t\t status_code, ntstatus_to_dos_map[idx].nt_errstr);\n-\t\t\treturn;\n-\t\t}\n-\t\tidx++;\n-\t}\n-\treturn;\n-}\n-\n-\n-static void\n-ntstatus_to_dos(__u32 ntstatus, __u8 *eclass, __u16 *ecode)\n+static const struct ntstatus_to_dos_err *\n+ntstatus_to_dos(__u32 ntstatus)\n {\n \tint i;\n \n \t/* Check nt_errstr to allow mapping of NT_STATUS_OK (0) */\n \tfor (i = 0; ntstatus_to_dos_map[i].nt_errstr; i++) {\n \t\tif (ntstatus == ntstatus_to_dos_map[i].ntstatus) {\n-\t\t\t*eclass = ntstatus_to_dos_map[i].dos_class;\n-\t\t\t*ecode = ntstatus_to_dos_map[i].dos_code;\n-\t\t\treturn;\n+\t\t\treturn &ntstatus_to_dos_map[i];\n \t\t}\n \t}\n-\t*eclass = ERRHRD;\n-\t*ecode = ERRgeneral;\n+\n+\treturn NULL;\n }\n \n int\n@@ -172,11 +150,20 @@ map_smb_to_linux_error(char *buf, bool logErr)\n \t\t/* translate the newer STATUS codes to old style SMB errors\n \t\t * and then to POSIX errors */\n \t\t__u32 err = le32_to_cpu(smb->Status.CifsError);\n-\t\tif (logErr && (err != (NT_STATUS_MORE_PROCESSING_REQUIRED)))\n-\t\t\tcifs_print_status(err);\n-\t\telse if (cifsFYI & CIFS_RC)\n-\t\t\tcifs_print_status(err);\n-\t\tntstatus_to_dos(err, &smberrclass, &smberrcode);\n+\t\tconst struct ntstatus_to_dos_err *map = ntstatus_to_dos(err);\n+\n+\t\tif (map) {\n+\t\t\tif ((logErr && err != NT_STATUS_MORE_PROCESSING_REQUIRED) ||\n+\t\t\t (cifsFYI & CIFS_RC))\n+\t\t\t\tpr_notice(\"Status code returned 0x%08x %s\\n\",\n+\t\t\t\t\t map->ntstatus, map->nt_errstr);\n+\n+\t\t\tsmberrclass = map->dos_class;\n+\t\t\tsmberrcode = map->dos_code;\n+\t\t} else {\n+\t\t\tsmberrclass = ERRHRD;\n+\t\t\tsmberrcode = ERRgeneral;\n+\t\t}\n \t} else {\n \t\tsmberrclass = smb->Status.DosError.ErrorClass;\n \t\tsmberrcode = le16_to_cpu(smb->Status.DosError.Error);\n","prefixes":["v3","04/13"]}