From patchwork Thu May 24 07:14:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve French X-Patchwork-Id: 919674 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="uLEvnwHk"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40s0y03Dh6z9s0x for ; Thu, 24 May 2018 17:14:48 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935346AbeEXHOr (ORCPT ); Thu, 24 May 2018 03:14:47 -0400 Received: from mail-pl0-f53.google.com ([209.85.160.53]:40116 "EHLO mail-pl0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964969AbeEXHOq (ORCPT ); Thu, 24 May 2018 03:14:46 -0400 Received: by mail-pl0-f53.google.com with SMTP id t12-v6so487405plo.7 for ; Thu, 24 May 2018 00:14:46 -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=NoE+aXWHBKndyuSTsym6vLaRLrA18kkORZdimbZWz8g=; b=uLEvnwHk9qfWFmLYBVj8SmWYeB2cg42lt6PQNmy0raLq8t8Vn7adUEFwXE1UswapXz DERV6kwFWqN0HGVM65BTMeikX0XKijIamXxJ6Gm3lJU/0Yp9L5FmxsNtDx1a8bmQxbGS bjzk4AGe8znSNKAGbQjesr+56SYhR05iw5SHau4dhADeajAYhi5SgTqOUYD/2geI2Lf+ Plup4GAJsalw5BdPjXPaiTbTrN6ySOxwCONXFR9ghkUW89ofuqjwwZVMz1hw33HNiudd iHBndxCLbrMO7WxnRM0fSw1l0y4UnARr2eQvYJDjQ83or2O9ZAqF60h65Pc+b7HxHUw9 DpMQ== 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=NoE+aXWHBKndyuSTsym6vLaRLrA18kkORZdimbZWz8g=; b=jsYrnJPjeL0wkpJxUdIbjur1z78ZtaNLFtYmAak4GDhB9ti++sk/xFzjnmGG1uGVZV hg9F6vsnHUjr6K/yA7t7tot6kyvyOULOFnHR4R3Ucbl079kupYZ7s43/WtGp24Id8GMQ sAZ8fj5c3umtSNUo3kx2z9th9DXuxN5BblcWAWtueeiMNQUZcqPRCqicbiGGB0vsADl+ X/0Gf7b9sG1mNsgnnpSAkDKYJ50hyqw3iTqxBuXS8Iq3U0t/CXxRZI5OtwZOplCPKkp4 O/WEJ2NiYUeawFW1zFnujZsAZZKnfrTZxB0N9l4GnCSqGVWuXUPGca8IC9KXcad48uGd WjkA== X-Gm-Message-State: ALKqPwckn7BaZKLoXfdva1l+Xkt/BsrfFxmzGDI6xcu6IOs9hQ3eRker sCXnliBu4bwBQ+Z2fAcjSzbE6ae5G3bMdMgIJdGsOg== X-Google-Smtp-Source: AB8JxZqZy2ukfgPCF1diaNKwSTNn8BhbILWMbN6XW0jYthYxhhgDRzb5/rQXsGd/5+tKxpxv31DVuJclkuZw8XayViQ= X-Received: by 2002:a17:902:8541:: with SMTP id d1-v6mr6321650plo.106.1527146085585; Thu, 24 May 2018 00:14:45 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a17:90a:bd8f:0:0:0:0 with HTTP; Thu, 24 May 2018 00:14:24 -0700 (PDT) From: Steve French Date: Thu, 24 May 2018 02:14:24 -0500 Message-ID: Subject: cifs: minor clarification to module param descriptions for cifs.ko To: CIFS Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org From b2aef2f4a3e27985019df63d3edbf28171dc39f1 Mon Sep 17 00:00:00 2001 From: Steve French Date: Thu, 24 May 2018 02:09:20 -0500 Subject: [PATCH] cifs: make minor clarifications to module params for cifs.ko Note which ones of the module params are cifs dialect only (N/A for default dialect now that has moved to SMB2.1 or later) Signed-off-by: Steve French --- fs/cifs/cifsfs.c | 6 ++++-- fs/cifs/cifsglob.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 645bb88f0ee4..c49d4a681017 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -64,7 +64,8 @@ unsigned int sign_CIFS_PDUs = 1; static const struct super_operations cifs_super_ops; unsigned int CIFSMaxBufSize = CIFS_MAX_MSGSIZE; module_param(CIFSMaxBufSize, uint, 0444); -MODULE_PARM_DESC(CIFSMaxBufSize, "Network buffer size (not including header). " +MODULE_PARM_DESC(CIFSMaxBufSize, "Network buffer size (not including header) " + "for CIFS requests. " "Default: 16384 Range: 8192 to 130048"); unsigned int cifs_min_rcv = CIFS_MIN_RCV_POOL; module_param(cifs_min_rcv, uint, 0444); @@ -76,7 +77,8 @@ MODULE_PARM_DESC(cifs_min_small, "Small network buffers in pool. Default: 30 " "Range: 2 to 256"); unsigned int cifs_max_pending = CIFS_MAX_REQ; module_param(cifs_max_pending, uint, 0444); -MODULE_PARM_DESC(cifs_max_pending, "Simultaneous requests to server. " +MODULE_PARM_DESC(cifs_max_pending, "Simultaneous requests to server for " + "CIFS/SMB1 dialect (N/A for SMB3) " "Default: 32767 Range: 2 to 32767."); module_param(enable_oplocks, bool, 0644); MODULE_PARM_DESC(enable_oplocks, "Enable or disable oplocks. Default: y/Y/1"); diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index 80a34cee0b91..1143daf3341e 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h @@ -632,7 +632,7 @@ struct TCP_Server_Info { bool oplocks:1; /* enable oplocks */ unsigned int maxReq; /* Clients should submit no more */ /* than maxReq distinct unanswered SMBs to the server when using */ - /* multiplexed reads or writes */ + /* multiplexed reads or writes (for SMB1/CIFS only, not SMB2/SMB3) */ unsigned int maxBuf; /* maxBuf specifies the maximum */ /* message size the server can send or receive for non-raw SMBs */ /* maxBuf is returned by SMB NegotiateProtocol so maxBuf is only 0 */ -- 2.17.0