From patchwork Fri Mar 22 12:42:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 2319431 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 4543E400E6 for ; Fri, 22 Mar 2013 12:43:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932482Ab3CVMnD (ORCPT ); Fri, 22 Mar 2013 08:43:03 -0400 Received: from mail-vc0-f177.google.com ([209.85.220.177]:65520 "EHLO mail-vc0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932119Ab3CVMnC (ORCPT ); Fri, 22 Mar 2013 08:43:02 -0400 Received: by mail-vc0-f177.google.com with SMTP id ia10so3113522vcb.22 for ; Fri, 22 Mar 2013 05:43:01 -0700 (PDT) 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=WF/dRjyES8DmEPp70nP6z4j42npjDKEPFUMmRIYCRuo=; b=FsgieALJeYqab+wEKRR02/WfAh6EHlHe7JLncWTVLh6dp5edu53Wj9SZKlVmbXAvo/ 6FCNhpkigpMPZidMxLqnQqNM6K1DXaJuXckTwJDzwBPGHSumqLUIYc44kTnyVxf2KX6h juBxN7T1OvpupdES2Cz1wjKYdH2fG0KXbxZORBkWmt47Oj6YnIpJKc8GYCMcBnHeblFq f59qmFHF/wPp62WhmDn5qc4jfhxE2dg6dxfp7UupvEDu67/gdFkai19XmHLFIDbOEU1a JZKLsMpcPyfuJJTYTxTY4OBwUhEFCgL2ut9fRMILR4LV4L6dxTAJiwAQ5qkmnyDSDhMh bYjg== X-Received: by 10.220.40.9 with SMTP id i9mr2000598vce.23.1363956181620; Fri, 22 Mar 2013 05:43:01 -0700 (PDT) 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 cl9sm2849264vdb.3.2013.03.22.05.43.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 22 Mar 2013 05:43:00 -0700 (PDT) From: Jeff Layton To: smfrench@gmail.com Cc: linux-cifs@vger.kernel.org Subject: [PATCH] cifs: ignore the unc= and prefixpath= mount options Date: Fri, 22 Mar 2013 08:42:57 -0400 Message-Id: <1363956177-10112-1-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.7 X-Gm-Message-State: ALoCoQkhLWO0Nz7j9pne9m5tNykCvWoqIeGr3LWXQzq4NcJUXysR4q8GCOXVUUM9UDBWTGVY24MZ Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org ...as advertised for 3.10. Signed-off-by: Jeff Layton --- fs/cifs/connect.c | 56 +++++-------------------------------------------------- 1 file changed, 5 insertions(+), 51 deletions(-) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 8cac0ba..edb2220 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -95,9 +95,7 @@ enum { /* Mount options which take string value */ Opt_user, Opt_pass, Opt_ip, - Opt_unc, Opt_domain, - Opt_srcaddr, Opt_prefixpath, - Opt_iocharset, + Opt_domain, Opt_srcaddr, Opt_iocharset, Opt_netbiosname, Opt_servern, Opt_ver, Opt_vers, Opt_sec, Opt_cache, @@ -193,14 +191,14 @@ static const match_table_t cifs_mount_option_tokens = { { Opt_blank_ip, "addr=" }, { Opt_ip, "ip=%s" }, { Opt_ip, "addr=%s" }, - { Opt_unc, "unc=%s" }, - { Opt_unc, "target=%s" }, - { Opt_unc, "path=%s" }, + { Opt_ignore, "unc=%s" }, + { Opt_ignore, "target=%s" }, + { Opt_ignore, "path=%s" }, { Opt_domain, "dom=%s" }, { Opt_domain, "domain=%s" }, { Opt_domain, "workgroup=%s" }, { Opt_srcaddr, "srcaddr=%s" }, - { Opt_prefixpath, "prefixpath=%s" }, + { Opt_ignore, "prefixpath=%s" }, { Opt_iocharset, "iocharset=%s" }, { Opt_netbiosname, "netbiosname=%s" }, { Opt_servern, "servern=%s" }, @@ -1644,30 +1642,6 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, } got_ip = true; break; - case Opt_unc: - string = vol->UNC; - vol->UNC = match_strdup(args); - if (vol->UNC == NULL) - goto out_nomem; - - convert_delimiter(vol->UNC, '\\'); - if (vol->UNC[0] != '\\' || vol->UNC[1] != '\\') { - printk(KERN_ERR "CIFS: UNC Path does not " - "begin with // or \\\\\n"); - goto cifs_parse_mount_err; - } - - /* Compare old unc= option to new one */ - if (!string || strcmp(string, vol->UNC)) - printk(KERN_WARNING "CIFS: the value of the " - "unc= mount option does not match the " - "device string. Using the unc= option " - "for now. In 3.10, that option will " - "be ignored and the contents of the " - "device string will be used " - "instead. (%s != %s)\n", string, - vol->UNC); - break; case Opt_domain: string = match_strdup(args); if (string == NULL) @@ -1700,26 +1674,6 @@ cifs_parse_mount_options(const char *mountdata, const char *devname, goto cifs_parse_mount_err; } break; - case Opt_prefixpath: - /* skip over any leading delimiter */ - if (*args[0].from == '/' || *args[0].from == '\\') - args[0].from++; - - string = vol->prepath; - vol->prepath = match_strdup(args); - if (vol->prepath == NULL) - goto out_nomem; - /* Compare old prefixpath= option to new one */ - if (!string || strcmp(string, vol->prepath)) - printk(KERN_WARNING "CIFS: the value of the " - "prefixpath= mount option does not " - "match the device string. Using the " - "prefixpath= option for now. In 3.10, " - "that option will be ignored and the " - "contents of the device string will be " - "used instead.(%s != %s)\n", string, - vol->prepath); - break; case Opt_iocharset: string = match_strdup(args); if (string == NULL)