From patchwork Wed Jul 18 17:59:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 1212821 Return-Path: X-Original-To: patchwork-cifs-client@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 6C4F93FD4F for ; Wed, 18 Jul 2012 17:59:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755313Ab2GRR70 (ORCPT ); Wed, 18 Jul 2012 13:59:26 -0400 Received: from mail-gg0-f174.google.com ([209.85.161.174]:54047 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755273Ab2GRR7Z (ORCPT ); Wed, 18 Jul 2012 13:59:25 -0400 Received: by mail-gg0-f174.google.com with SMTP id u4so1863454ggl.19 for ; Wed, 18 Jul 2012 10:59:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=+gjgzaKSryrWrgDWASc3HMBhmDoDM9vVvFprD6zVqB8=; b=VXYYP0+mrjv1bZocmRYd3EAr0J10Bn8dEfxQe8xVJmX0Kp9p1IKL6HoxuvSKV7b9Bf xpsh7+qyAJzHb0HAQl1wzSmw+O34CGFai60KJvtke4DjbXWUCH3QkH581soahDQXJlvE /jVqKM3I8xDDeYTTZUpXvT+Q8MQd2RgbKJDOI/eApONbTss+kmNxn1cy27URcqy4ATgj JsQnAAF9B7oRZHtn1z+NA3PT4Iqr4+BUdUKQqiCIozAhVpVnXaOiCEsYHMkOCs11HYJJ LkYkY4RgAqW/b24bM2u0mw23gzOGtCjrFgXRY6EmYDBVm/6L3ljyg1Utm5mDE8gt5+N0 d1Bw== Received: by 10.236.124.13 with SMTP id w13mr1721036yhh.76.1342634365366; Wed, 18 Jul 2012 10:59:25 -0700 (PDT) Received: from salusa.poochiereds.net (cpe-076-182-054-194.nc.res.rr.com. [76.182.54.194]) by mx.google.com with ESMTPS id e5sm20270107ani.18.2012.07.18.10.59.24 (version=SSLv3 cipher=OTHER); Wed, 18 Jul 2012 10:59:24 -0700 (PDT) From: Jeff Layton To: smfrench@gmail.com Cc: linux-cifs@vger.kernel.org Subject: [PATCH 11/11] cifs: add deprecation warning to sockopt=TCP_NODELAY option Date: Wed, 18 Jul 2012 13:59:06 -0400 Message-Id: <1342634346-22818-12-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1342634346-22818-1-git-send-email-jlayton@redhat.com> References: <1342634346-22818-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQmR8knQl8IrpgOoNEydqpy/XVa/mrEwBZdEoi/vGDmrjYrOW8YBFWwYPuQQqVLhd7ytEgBH Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org Now that we're using TCP_CORK on the socket, there's no value in continuting to support this option. Schedule it for removal in 3.8. Signed-off-by: Jeff Layton Reviewed-by: Pavel Shilovsky --- fs/cifs/connect.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 303be53..29d9716 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -1830,12 +1830,13 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, if (string == NULL) goto out_nomem; - /* - * FIXME: since we now cork/uncork the socket while - * sending, should we deprecate this option? - */ - if (strnicmp(string, "TCP_NODELAY", 11) == 0) + 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.8\n"); vol->sockopt_tcp_nodelay = 1; + } break; case Opt_netbiosname: string = match_strdup(args);