From patchwork Thu Jun 11 14:22:26 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 29568 Received: from lists.samba.org (mail.samba.org [66.70.73.150]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n5BEN2EV024952 for ; Thu, 11 Jun 2009 14:23:02 GMT Received: from dp.samba.org (localhost [127.0.0.1]) by lists.samba.org (Postfix) with ESMTP id 73B56163DB2 for ; Thu, 11 Jun 2009 14:22:29 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on dp.samba.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.8 tests=AWL,BAYES_00, FORGED_RCVD_HELO,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.1.7 X-Original-To: linux-cifs-client@lists.samba.org Delivered-To: linux-cifs-client@lists.samba.org Received: from mx2.redhat.com (mx2.redhat.com [66.187.237.31]) by lists.samba.org (Postfix) with ESMTP id E8AE6163B78 for ; Thu, 11 Jun 2009 14:21:58 +0000 (GMT) Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n5BEMRgO031980; Thu, 11 Jun 2009 10:22:27 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n5BEMQ7H031873; Thu, 11 Jun 2009 10:22:26 -0400 Received: from localhost.localdomain (barsoom.rdu.redhat.com [10.11.228.36]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n5BEMQ89025145; Thu, 11 Jun 2009 10:22:26 -0400 From: Jeff Layton To: smfrench@gmail.com Date: Thu, 11 Jun 2009 10:22:26 -0400 Message-Id: <1244730146-19638-2-git-send-email-jlayton@redhat.com> In-Reply-To: <1244730146-19638-1-git-send-email-jlayton@redhat.com> References: <1244730146-19638-1-git-send-email-jlayton@redhat.com> X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Cc: linux-cifs-client@lists.samba.org Subject: [linux-cifs-client] [PATCH] cifs: remove "sockopt" mount option X-BeenThere: linux-cifs-client@lists.samba.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: The Linux CIFS VFS client List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-cifs-client-bounces+patchwork-cifs-client=patchwork.kernel.org@lists.samba.org Errors-To: linux-cifs-client-bounces+patchwork-cifs-client=patchwork.kernel.org@lists.samba.org ...another dead option that was never hooked up to anything. Signed-off-by: Jeff Layton --- fs/cifs/connect.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 97f4311..8b8dd9f 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -99,7 +99,6 @@ struct smb_vol { bool nostrictsync:1; /* do not force expensive SMBflush on every sync */ unsigned int rsize; unsigned int wsize; - unsigned int sockopt; unsigned short int port; char *prepath; }; @@ -1137,11 +1136,6 @@ cifs_parse_mount_options(char *options, const char *devname, vol->wsize = simple_strtoul(value, &value, 0); } - } else if (strnicmp(data, "sockopt", 5) == 0) { - if (value && *value) { - vol->sockopt = - simple_strtoul(value, &value, 0); - } } else if (strnicmp(data, "netbiosname", 4) == 0) { if (!value || !*value || (*value == ' ')) { cFYI(1, ("invalid (empty) netbiosname"));