From patchwork Mon May 22 16:33:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve French X-Patchwork-Id: 13250836 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9990DC7EE23 for ; Mon, 22 May 2023 16:33:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232923AbjEVQdp (ORCPT ); Mon, 22 May 2023 12:33:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231923AbjEVQdo (ORCPT ); Mon, 22 May 2023 12:33:44 -0400 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3BAB2115; Mon, 22 May 2023 09:33:33 -0700 (PDT) Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-4f3b4ed6fdeso2884254e87.3; Mon, 22 May 2023 09:33:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684773210; x=1687365210; h=cc:to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=8Uo0WEkLCe3Cw96Uf4fOVUWnLRSpQg7vAMYevt1zxP0=; b=mB1iFp6bUn/8wPUHtd4PX+dr1FIoKOxsvwliC56OhnQQ103I/n4WOoGGz/K/xi/hzE 7PehPPz59C3kntkHKtARObgYWCKjn7QURUHACS2QolYAlMinzwQeaoa8P7OJzao+0+ig FeukPgSdiSPRqIJ6zZPebmBOPm5I+Jd8yCo1bDDsxb7qNPXcQ4EGEFMCWF6OvBb8enAI 3zrfdjaOQluCyEMkmCXY+B8DDBt4aCG3IWJZOKARJh/Z9Ki2zvbIDIhKcc/NpYGUyoAP cVbTAF11a+pvqdhZZLPnZosBCw1uIkzJw8ZoLb+rZGwCfXWBmxdsM6l7YiGcY5SWRhY5 pXIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684773210; x=1687365210; h=cc:to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=8Uo0WEkLCe3Cw96Uf4fOVUWnLRSpQg7vAMYevt1zxP0=; b=YTIJ7hm5HmvWmuvLsgUpgwfuWe86SuM/9A4/SJKFJ1ItElDG0iasXwnMvIlLfK9e+F aDmuAKsqCHcjcJNOaPXSzIF9kwYMyA8wGYnTXeOTPSsEd5CmfAGeVkA2gC886GVxvCo2 hRwNuuhABU8a4PVb96PGwrWkDyCoxWwpURIfJkgZZus9WGdgr4DUqlkAj161hqOOhESs pKzZtx1GYOo+3dqfLhNT7R/o62x0iTHFz+RTT+3GK/UFy2CjpZ/7Zp6KTOqBAkf6CNAj LW1Sz9FhgDBpCdwcVYj8dtrzZeW+pEQfH3qmLwDXcYdLgxnm/3xZpWvHzTiBm7Qle8Kj URVw== X-Gm-Message-State: AC+VfDzyKvdrxGGkxSd+mKHETi9HX/UIuFFzhqdd3OpPONhPQfjiFy7g 3r4WYuiTX9bdAoebtSraS1hz+2+VXDfCKmkLzyHXGF19LrzV8Xbm X-Google-Smtp-Source: ACHHUZ76a1T1e16BMol1yE51gfA6g0yGbZRpZWKx7qvNvAsoHtKgkXn2VXVvJStvFUba8scWcEBr80McTXsV1zsB+eA= X-Received: by 2002:a05:6512:218d:b0:4f3:ab1b:f765 with SMTP id b13-20020a056512218d00b004f3ab1bf765mr3619547lft.18.1684773210284; Mon, 22 May 2023 09:33:30 -0700 (PDT) MIME-Version: 1.0 From: Steve French Date: Mon, 22 May 2023 11:33:18 -0500 Message-ID: Subject: patches to move ksmbd and cifs under new subdirectory To: CIFS Cc: Linus Torvalds , samba-technical , Namjae Jeon , LKML , linux-fsdevel Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org Following up on the email thread suggestion to move fs/ksmbd and fs/cifs and fs/smbfs_common all under a common directory fs/smb, here is an updated patchset for that (added one small patch). 1) smb3: move Documentation/filesystems/cifs to Documentation/filesystems/smb As suggested by Namjae, update the directory for ksmbd/cifs.ko Documentation. Documentation/filesystems/cifs contains both server and client information so its pathname is misleading. In addition, the directory fs/smb now contains both server and client, so move Documentation/filesystems/cifs to Documentation/filesystems/smb Suggested-by: Namjae Jeon 2) cifs: correct references in Documentation to old fs/cifs path The fs/cifs directory has moved to fs/smb/client, correct mentions of this in Documentation and comments. 3) smb: move client and server files to common directory fs/smb As suggested by Linus, move CIFS/SMB3 related client and server files (cifs.ko and ksmbd.ko and helper modules) to new fs/smb subdirectory: fs/cifs --> fs/smb/client fs/ksmbd --> fs/smb/server fs/smbfs_common --> fs/smb/conmon Thanks, Steve From 449ef93f80ae51c0edac57d74aae3bc113dcca58 Mon Sep 17 00:00:00 2001 From: Steve French Date: Mon, 22 May 2023 09:50:33 -0500 Subject: [PATCH 3/3] smb3: move Documentation/filesystems/cifs to Documentation/filesystems/smb Documentation/filesystems/cifs contains both server and client information so its pathname is misleading. In addition, the directory fs/smb now contains both server and client, so move Documentation/filesystems/cifs to Documentation/filesystems/smb Suggested-by: Namjae Jeon Signed-off-by: Steve French --- Documentation/filesystems/{cifs => smb}/cifsroot.rst | 0 Documentation/filesystems/{cifs => smb}/index.rst | 0 Documentation/filesystems/{cifs => smb}/ksmbd.rst | 0 MAINTAINERS | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename Documentation/filesystems/{cifs => smb}/cifsroot.rst (100%) rename Documentation/filesystems/{cifs => smb}/index.rst (100%) rename Documentation/filesystems/{cifs => smb}/ksmbd.rst (100%) diff --git a/Documentation/filesystems/cifs/cifsroot.rst b/Documentation/filesystems/smb/cifsroot.rst similarity index 100% rename from Documentation/filesystems/cifs/cifsroot.rst rename to Documentation/filesystems/smb/cifsroot.rst diff --git a/Documentation/filesystems/cifs/index.rst b/Documentation/filesystems/smb/index.rst similarity index 100% rename from Documentation/filesystems/cifs/index.rst rename to Documentation/filesystems/smb/index.rst diff --git a/Documentation/filesystems/cifs/ksmbd.rst b/Documentation/filesystems/smb/ksmbd.rst similarity index 100% rename from Documentation/filesystems/cifs/ksmbd.rst rename to Documentation/filesystems/smb/ksmbd.rst diff --git a/MAINTAINERS b/MAINTAINERS index 902f763e845d..6152a4251ce7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11300,7 +11300,7 @@ R: Tom Talpey L: linux-cifs@vger.kernel.org S: Maintained T: git git://git.samba.org/ksmbd.git -F: Documentation/filesystems/cifs/ksmbd.rst +F: Documentation/filesystems/smb/ksmbd.rst F: fs/smb/common/ F: fs/smb/server/ -- 2.34.1