From patchwork Thu Jun 3 06:39:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Lovenberg X-Patchwork-Id: 104029 Received: from lists.samba.org (fn.samba.org [216.83.154.106]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o536dV9e028688 for ; Thu, 3 Jun 2010 06:40:07 GMT Received: from fn.samba.org (localhost [127.0.0.1]) by lists.samba.org (Postfix) with ESMTP id 3CB12AC2C5; Thu, 3 Jun 2010 00:39:33 -0600 (MDT) X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on fn.samba.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=3.8 tests=AWL, BAYES_00, NO_MORE_FUNN, SPF_PASS autolearn=no version=3.2.5 X-Original-To: linux-cifs-client@lists.samba.org Delivered-To: linux-cifs-client@lists.samba.org Received: from mail-vw0-f41.google.com (mail-vw0-f41.google.com [209.85.212.41]) by lists.samba.org (Postfix) with ESMTP id A9362AC242 for ; Thu, 3 Jun 2010 00:39:27 -0600 (MDT) Received: by vws13 with SMTP id 13so9270957vws.14 for ; Wed, 02 Jun 2010 23:39:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:content-type:content-transfer-encoding; bh=HgfMOBLWQ1DrEjGCPH6K4fyH0/p/l0Sn0OO8E41Z2rk=; b=XO/M0BXdJ78a6JUikX9kOunwfVQA29II/ASKoOGKQk3xBR4hotG+FY565dgMm2v0HK zrwONiRLavCj+nXxyr85lU0rEXL6S/uhL60Cy279TxMVZY+XsWApfq9sKSYOIVvgNgEM 9y40UkJDBe0XWy+xf6Qxh03TxcLbtydsZTbe0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:content-type :content-transfer-encoding; b=uq87bSKBxuHW1UaBWz12hAXFGUXSFb1SO91HZJ6NUiJ26j3sBFX3Oynx1/0Pd2q5qD c+dvj2SOC2UGclzOiysJWxOuuvz8tpA7sz0GXLy5WaAfvfgZG282Xcj4wuQzIscdRJ7/ 8XLDZ2eR95CInQCG/v8z3Knzb+otYMv40wloI= Received: by 10.220.107.8 with SMTP id z8mr6526136vco.74.1275547164173; Wed, 02 Jun 2010 23:39:24 -0700 (PDT) Received: from localhost.localdomain (24.115.161.116.res-cmts.flt.ptd.net [24.115.161.116]) by mx.google.com with ESMTPS id v12sm38996803vch.21.2010.06.02.23.39.21 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 02 Jun 2010 23:39:21 -0700 (PDT) From: Scott Lovenberg To: linux-cifs-client@lists.samba.org Date: Thu, 3 Jun 2010 02:39:19 -0400 Message-Id: <1275547159-30008-1-git-send-email-scott.lovenberg@gmail.com> X-Mailer: git-send-email 1.6.2.5 Cc: jlayton@samba.org Subject: [linux-cifs-client] [PATCH] accept all supported values for dir_mode X-BeenThere: linux-cifs-client@lists.samba.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: The Linux CIFS VFS client List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-cifs-client-bounces@lists.samba.org Errors-To: linux-cifs-client-bounces@lists.samba.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 03 Jun 2010 06:40:16 +0000 (UTC) diff --git a/mount.cifs.c b/mount.cifs.c index 65754c0..21ce532 100644 --- a/mount.cifs.c +++ b/mount.cifs.c @@ -812,7 +812,7 @@ static int parse_opt_token(const char *token) return OPT_FILE_MODE; if (strncmp(token, "dmask", 5) == 0) return OPT_DMASK; - if (strncmp(token, "dir_mode", 8) == 0) + if (strncmp(token, "dir_mode", 4) == 0 || strncmp(token, "dirm", 4) == 0) return OPT_DIR_MODE; if (strncmp(token, "nosuid", 6) == 0) return OPT_NO_SUID;