From patchwork Thu Jun 28 23:52:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve French X-Patchwork-Id: 936555 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-cifs-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NYa/V9jK"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41GxQq6Yf0z9s0n for ; Fri, 29 Jun 2018 09:52:19 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752489AbeF1XwS (ORCPT ); Thu, 28 Jun 2018 19:52:18 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:37565 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751539AbeF1XwS (ORCPT ); Thu, 28 Jun 2018 19:52:18 -0400 Received: by mail-pf0-f195.google.com with SMTP id h20-v6so1395594pfn.4 for ; Thu, 28 Jun 2018 16:52:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=GMXspjWQD6yBU1ujxd+p3QgyOlbqJG/pTiax+NB7guU=; b=NYa/V9jKcxVm5FxwcbZM2oAwnFZlfFGiJWMVO0Eg/xAQbWinS0VgePuPWYQeJIaUqk hkUd16wwSn/e3kaJKuuyFfebjLwPBAVCuvSaa43gpvurD0Gp5wRIhP/PuXJi21PWJXFV o98fp6xsJHkOPj9zWh3MPiu5UdY1BzqSVcZAtWmKtkipc74LnZQdGk4JCSFKUE+7NaGe 2OSTM3xf/Jnx0tPhQbbK8F2ybsdFDQeRZxJMq+dPRy0/SUmZlxfVPGuJw+o0R3QM9C7C sRxfyaJmatWG8nwIci8/jbkj0m0eSigg5tcjtellbQy/4FgoJBKjVVTi2MkbnjgyfH7T zCpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=GMXspjWQD6yBU1ujxd+p3QgyOlbqJG/pTiax+NB7guU=; b=uXTVhTed1l9LhDdx3ZiN9gUYuh1et9IRocFAzJEsn5T/ikmvbR1AaG/GCCW/glQGdL bi99bvxXEBjTx/Y7kFaTvnfzCRPqh1e4Y9CIcLR5biPmuLpI0A6eYKxfTAdqYdyer25q GEtrJQH6A/11SYGB6qZ9pP/9pNhS+DK+ENCN5Db/KjZGMWs3KPcJp70HeB6BG9FwRwxI jjwUExfgT2aaSApIGwZvB1KdcAQCFvoj+hfuI7kzU8sXJ5wkQXiQdZIZYkc25O1zv0cZ 8JbWD8HHOT5JDNSF35dRxFld3QN5Cepl1znNCegC7wPwvB4uPzD6AalLz6jLWnKdGEf6 yHGQ== X-Gm-Message-State: APt69E1OPxL2T522GAYMjCHgrc0r+2mSDnXN/ly6edPZVfPYlxM1KzP1 h9MM+JhjpU+KgrfeSXTIkpTao3SBhg2YlAF021/go3fB X-Google-Smtp-Source: ADUXVKKKxArcLYnlgA6NO9A1SoPCu06AbPNWrpTLxDDREn/XCejaAuZ9U/FLno3VZOrsB4xzFyapP8dvzCIL48v2BZE= X-Received: by 2002:a63:6b49:: with SMTP id g70-v6mr10762567pgc.30.1530229937508; Thu, 28 Jun 2018 16:52:17 -0700 (PDT) MIME-Version: 1.0 From: Steve French Date: Thu, 28 Jun 2018 18:52:06 -0500 Message-ID: Subject: [PATCH] cifs: add missing debug entries for kconfig options To: CIFS Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org /proc/fs/cifs/DebugData displays the features (Kconfig options) used to build cifs.ko but it was missing some, and needed comma separator. These can be useful in debugging certain problems so we know which optional features were enabled in the user's build. Also clarify them, by making them more closely match the corresponding CONFIG_CIFS_* parm. Old format: Features: dfs fscache posix spnego xattr acl New format: Features: DFS,FSCACHE,SMB_DIRECT,STATS,DEBUG2,ALLOW_INSECURE_LEGACY,CIFS_POSIX,UPCALL(SPNEGO),XATTR,ACL Signed-off-by: Steve French CC: Stable Reviewed-by: Paulo Alcantara Reviewed-by: Paulo Alcantara Reviewed-by: Pavel Shilovsky --- fs/cifs/cifs_debug.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) seq_printf(m, "Active VFS Requests: %d\n", GlobalTotalActiveXid); From 4fe9a636f1cdd0853ff36902477bbfabdd7fd098 Mon Sep 17 00:00:00 2001 From: Steve French Date: Thu, 28 Jun 2018 18:46:40 -0500 Subject: [PATCH] cifs: add missing debug entries for kconfig options /proc/fs/cifs/DebugData displays the features (Kconfig options) used to build cifs.ko but it was missing some, and needed comma separator. These can be useful in debugging certain problems so we know which optional features were enabled in the user's build. Also clarify them, by making them more closely match the corresponding CONFIG_CIFS_* parm. Old format: Features: dfs fscache posix spnego xattr acl New format: Features: DFS,FSCACHE,SMB_DIRECT,STATS,DEBUG2,ALLOW_INSECURE_LEGACY,CIFS_POSIX,UPCALL(SPNEGO),XATTR,ACL Signed-off-by: Steve French CC: Stable --- fs/cifs/cifs_debug.c | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c index bfe999505815..72f72d1935b1 100644 --- a/fs/cifs/cifs_debug.c +++ b/fs/cifs/cifs_debug.c @@ -160,25 +160,41 @@ static int cifs_debug_data_proc_show(struct seq_file *m, void *v) seq_printf(m, "CIFS Version %s\n", CIFS_VERSION); seq_printf(m, "Features:"); #ifdef CONFIG_CIFS_DFS_UPCALL - seq_printf(m, " dfs"); + seq_printf(m, " DFS"); #endif #ifdef CONFIG_CIFS_FSCACHE - seq_printf(m, " fscache"); + seq_printf(m, ",FSCACHE"); +#endif +#ifdef CONFIG_CIFS_SMB_DIRECT + seq_printf(m, ",SMB_DIRECT"); +#endif +#ifdef CONFIG_CIFS_STATS2 + seq_printf(m, ",STATS2"); +#elif CONFIG_CIFS_STATS + seq_printf(m, ",STATS"); +#endif +#ifdef CONFIG_CIFS_DEBUG2 + seq_printf(m, ",DEBUG2"); +#elif CONFIG_CIFS_DEBUG + seq_printf(m, ",DEBUG"); +#endif +#ifdef CONFIG_CIFS_ALLOW_INSECURE_LEGACY + seq_printf(m, ",ALLOW_INSECURE_LEGACY"); #endif #ifdef CONFIG_CIFS_WEAK_PW_HASH - seq_printf(m, " lanman"); + seq_printf(m, ",WEAK_PW_HASH"); #endif #ifdef CONFIG_CIFS_POSIX - seq_printf(m, " posix"); + seq_printf(m, ",CIFS_POSIX"); #endif #ifdef CONFIG_CIFS_UPCALL - seq_printf(m, " spnego"); + seq_printf(m, ",UPCALL(SPNEGO)"); #endif #ifdef CONFIG_CIFS_XATTR - seq_printf(m, " xattr"); + seq_printf(m, ",XATTR"); #endif #ifdef CONFIG_CIFS_ACL - seq_printf(m, " acl"); + seq_printf(m, ",ACL"); #endif seq_putc(m, '\n'); seq_printf(m, "Active VFS Requests: %d\n", GlobalTotalActiveXid); -- 2.17.1