From patchwork Mon Jul 26 17:05:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 114315 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 o6QH5XQD028070 for ; Mon, 26 Jul 2010 17:05:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754671Ab0GZRFd (ORCPT ); Mon, 26 Jul 2010 13:05:33 -0400 Received: from cdptpa-omtalb.mail.rr.com ([75.180.132.122]:32987 "EHLO cdptpa-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754608Ab0GZRFc (ORCPT ); Mon, 26 Jul 2010 13:05:32 -0400 X-Authority-Analysis: v=1.1 cv=dHSs0xG8jwIKQYJm3xg8/3EbLs6EAEdD2Kdw41XeKVQ= c=1 sm=0 a=PDlgpwkWLBcA:10 a=ld/erqUjW76FpBUqCqkKeA==:17 a=hGzw-44bAAAA:8 a=ojcCkK3w1kZOn0_t6eEA:9 a=JEZailpsZmQ_RITxJqkA:7 a=km5fBqnieT9x1Fwwq0RguW9g10kA:4 a=dowx1zmaLagA:10 a=ld/erqUjW76FpBUqCqkKeA==:117 X-Cloudmark-Score: 0 X-Originating-IP: 71.70.153.3 Received: from [71.70.153.3] ([71.70.153.3:47591] helo=mail.poochiereds.net) by cdptpa-oedge03.mail.rr.com (envelope-from ) (ecelerity 2.2.2.39 r()) with ESMTP id 20/65-10420-B50CD4C4; Mon, 26 Jul 2010 17:05:31 +0000 Received: by mail.poochiereds.net (Postfix, from userid 4447) id CA32E58125; Mon, 26 Jul 2010 13:05:30 -0400 (EDT) From: Jeff Layton To: linux-cifs@vger.kernel.org Subject: [PATCH] mount.cifs: ignore the "_netdev" mount option Date: Mon, 26 Jul 2010 13:05:30 -0400 Message-Id: <1280163930-983-3-git-send-email-jlayton@samba.org> X-Mailer: git-send-email 1.7.1.1 In-Reply-To: <1280163930-983-1-git-send-email-jlayton@samba.org> References: <1280163930-983-1-git-send-email-jlayton@samba.org> 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 17:05:33 +0000 (UTC) diff --git a/mount.cifs.c b/mount.cifs.c index 1ca9507..89b728c 100644 --- a/mount.cifs.c +++ b/mount.cifs.c @@ -133,6 +133,7 @@ * Values for parsing command line options. */ #define OPT_ERROR -1 +#define OPT_IGNORE 0 #define OPT_USERS 1 #define OPT_USER 2 #define OPT_USER_XATTR 3 @@ -842,6 +843,8 @@ static int parse_opt_token(const char *token) return OPT_RW; if (strncmp(token, "remount", 7) == 0) return OPT_REMOUNT; + if (strncmp(token, "_netdev", 7) == 0) + return OPT_IGNORE; return OPT_ERROR; } @@ -1140,6 +1143,8 @@ parse_options(const char *data, struct parsed_mount_info *parsed_info) case OPT_REMOUNT: *filesys_flags |= MS_REMOUNT; break; + case OPT_IGNORE: + goto nocopy; } /* check size before copying option to buffer */