From patchwork Thu Feb 21 11:32:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 2171261 Return-Path: X-Original-To: patchwork-cifs-client@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id DADD1DF215 for ; Thu, 21 Feb 2013 11:33:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753588Ab3BULdF (ORCPT ); Thu, 21 Feb 2013 06:33:05 -0500 Received: from mail-ye0-f179.google.com ([209.85.213.179]:38977 "EHLO mail-ye0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753564Ab3BULdE (ORCPT ); Thu, 21 Feb 2013 06:33:04 -0500 Received: by mail-ye0-f179.google.com with SMTP id m4so1629718yen.24 for ; Thu, 21 Feb 2013 03:33:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=dvrEE93H/zJWuCyjsgG1yie2tXaCL6WnSUR4OwBxw2E=; b=jS3I8U1vUrqwnmzjjZdOB8qiIKaaP4/gGSuQkTuzJbCkXg1SalV6irkoI1LrmaRKkG mPZfUh7tMILMCoQ6rTyQ5lrWcaTouA35JuZAJlbfU+y81zQP3GRbf97Tw18Nbgp/gxvj bBq+kDLOUrR6+AHpMsX4GnsQ9TzxwPx7yuNJIl3cfO228rkZtH6Vn5GwRuN+6LKX1QbA vQYijW5s2CkSjyH7Tg7+BJwwlixwmRuRCP8X3tMQoS/NAkx5fzy9+H2a6NgbLEX4+ktK dVDwzKCE63nEKcXeXkR19ac4GtWYp34zlZgJkg1QKxbzOZ8TapRkt3ekEK9fsvLK23Uc IOEA== X-Received: by 10.236.89.49 with SMTP id b37mr44197536yhf.33.1361446383761; Thu, 21 Feb 2013 03:33:03 -0800 (PST) Received: from salusa.poochiereds.net (cpe-107-015-113-143.nc.res.rr.com. [107.15.113.143]) by mx.google.com with ESMTPS id i24sm76586760ann.16.2013.02.21.03.33.02 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 21 Feb 2013 03:33:03 -0800 (PST) From: Jeff Layton To: smfrench@gmail.com Cc: linux-cifs@vger.kernel.org Subject: [PATCH] cifs: remove the sockopt= mount option Date: Thu, 21 Feb 2013 06:32:59 -0500 Message-Id: <1361446379-7970-1-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.7 X-Gm-Message-State: ALoCoQkl6iUlBgh4J2FtlFZTgRUpQlT+0mWxfnqc4YUWjfxIFwt4GMOSvXZnj5KSfza1cNgVcoM9 Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org ...as promised for 3.9. Signed-off-by: Jeff Layton --- fs/cifs/connect.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index d997737..8609c42 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -97,7 +97,7 @@ enum { Opt_user, Opt_pass, Opt_ip, Opt_unc, Opt_domain, Opt_srcaddr, Opt_prefixpath, - Opt_iocharset, Opt_sockopt, + Opt_iocharset, Opt_netbiosname, Opt_servern, Opt_ver, Opt_vers, Opt_sec, Opt_cache, @@ -202,7 +202,6 @@ static const match_table_t cifs_mount_option_tokens = { { Opt_srcaddr, "srcaddr=%s" }, { Opt_prefixpath, "prefixpath=%s" }, { Opt_iocharset, "iocharset=%s" }, - { Opt_sockopt, "sockopt=%s" }, { Opt_netbiosname, "netbiosname=%s" }, { Opt_servern, "servern=%s" }, { Opt_ver, "ver=%s" }, @@ -1722,19 +1721,6 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, */ cFYI(1, "iocharset set to %s", string); break; - case Opt_sockopt: - string = match_strdup(args); - if (string == NULL) - goto out_nomem; - - if (strnicmp(string, "TCP_NODELAY", 11) == 0) { - printk(KERN_WARNING "CIFS: the " - "sockopt=TCP_NODELAY option has been " - "deprecated and will be removed " - "in 3.9\n"); - vol->sockopt_tcp_nodelay = 1; - } - break; case Opt_netbiosname: string = match_strdup(args); if (string == NULL)