From patchwork Mon Jul 26 14:29:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 114288 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6QEU4So032599 for ; Mon, 26 Jul 2010 14:30:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754299Ab0GZOaB (ORCPT ); Mon, 26 Jul 2010 10:30:01 -0400 Received: from cdptpa-omtalb.mail.rr.com ([75.180.132.121]:48954 "EHLO cdptpa-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754221Ab0GZOaB (ORCPT ); Mon, 26 Jul 2010 10:30:01 -0400 X-Authority-Analysis: v=1.0 c=1 a=6TzD3Aea33kA:10 a=20KFwNOVAAAA:8 a=wLAOSGAR1-OiGHV4MX8A:9 a=GL3jQG9Lu6et4uAeAVwgLxsd3V4A:4 a=jEp0ucaQiEUA:10 X-Cloudmark-Score: 0 X-Originating-IP: 71.70.153.3 Received: from [71.70.153.3] ([71.70.153.3:52422] helo=mail.poochiereds.net) by cdptpa-oedge01.mail.rr.com (envelope-from ) (ecelerity 2.2.2.39 r()) with ESMTP id EB/E1-03451-7EB9D4C4; Mon, 26 Jul 2010 14:29:59 +0000 Received: by mail.poochiereds.net (Postfix, from userid 4447) id 2F13058124; Mon, 26 Jul 2010 10:29:59 -0400 (EDT) From: Jeff Layton To: smfrench@gmail.com Cc: linux-cifs@vger.kernel.org Subject: [PATCH 2/2] cifs: ignore the "mand", "nomand" and "_netdev" mount options Date: Mon, 26 Jul 2010 10:29:58 -0400 Message-Id: <1280154598-29628-2-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.1.1 In-Reply-To: <1280154598-29628-1-git-send-email-jlayton@redhat.com> References: <1280154598-29628-1-git-send-email-jlayton@redhat.com> Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 26 Jul 2010 14:30:04 +0000 (UTC) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index d91a608..85a994c 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -1264,6 +1264,12 @@ cifs_parse_mount_options(char *options, const char *devname, } else if ((strnicmp(data, "nocase", 6) == 0) || (strnicmp(data, "ignorecase", 10) == 0)) { vol->nocase = 1; + } else if (strnicmp(data, "mand", 4) == 0) { + /* ignore */ + } else if (strnicmp(data, "nomand", 6) == 0) { + /* ignore */ + } else if (strnicmp(data, "_netdev", 7) == 0) { + /* ignore */ } else if (strnicmp(data, "brl", 3) == 0) { vol->nobrl = 0; } else if ((strnicmp(data, "nobrl", 5) == 0) ||