From patchwork Wed Jan 27 21:44:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Harvey X-Patchwork-Id: 1432383 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-cifs-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=adamharvey.name header.i=@adamharvey.name header.a=rsa-sha256 header.s=google header.b=HRQqk5Hm; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4DQxzd3S76z9sVX for ; Thu, 28 Jan 2021 08:47:57 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234967AbhA0Vrj (ORCPT ); Wed, 27 Jan 2021 16:47:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231416AbhA0Vpb (ORCPT ); Wed, 27 Jan 2021 16:45:31 -0500 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F14AAC061573 for ; Wed, 27 Jan 2021 13:44:50 -0800 (PST) Received: by mail-pf1-x433.google.com with SMTP id w14so2230450pfi.2 for ; Wed, 27 Jan 2021 13:44:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adamharvey.name; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GWylxxniWolLjuTyr6PPGv+53DqSkPBxUk8s1BRW+R0=; b=HRQqk5Hmjlve6m5fZgLbel9z48UVVy43LKc+zWNJj8/IsN7j9/pgg8+9knTJsAh1IP 7LsHnFiEfsGj9ieNyCdtzJLk4lHu/0TJAEULT5V9hRvGjM7iVBf2/oRsEqDdSQRHZWtM GxT6PpHDCv2VfsB5gsp1NcYQxe6irloVqxM3E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GWylxxniWolLjuTyr6PPGv+53DqSkPBxUk8s1BRW+R0=; b=Evyil4cPbrWdsHPG2E4ycCuJgbFWcWar1QvQpYuOLNFNr8o8Otq4LXwDkdiGl46jFq 9BomOAzpnOW0yeFqPMVjw37A7unImWFLPLPhx3FSxtQBJdd3dMUl3zpTywUgscPoeY0x zsqDO1knGJc7YjJtKZAzqJXEfu53GLNj8dZpx7G1vlpxdKGHMioF6q1KXJ0euyquaIdt Rp4wmhCKooSzI8ZeUAuI79LuYaT66sjap9RH3GXN1tcdv/dIM3WUh0poFOfoEeaHLSlQ +LkB00apssBpggOb+ZXTqrCWcUvkn/eCCV0OYaD+VWRg3/OmLVG7tD6Wj+FSD9ANkurU OPpA== X-Gm-Message-State: AOAM532DJPmXqJ6XDa2THdPUHZaTw1jPznFZQMnRcLoiNN+yipCzJ9vE XG6l4a6PM8GHGSezQ2Hl7z3VAmnk9mmZtsVJ X-Google-Smtp-Source: ABdhPJz4yEnDfN3aYH/8pJaYQPEHg1Vm55bZViyzTR2PcCUswviDsXiEY7Nuv8Zm+OQSuxmgjQ6IZw== X-Received: by 2002:a65:4203:: with SMTP id c3mr13270803pgq.65.1611783889654; Wed, 27 Jan 2021 13:44:49 -0800 (PST) Received: from nosecam.localdomain (node-1w7jr9qw9msspx5ewy5tkdyef.ipv6.telus.net. [2001:569:7eea:3500:ca69:1f75:9176:e767]) by smtp.gmail.com with ESMTPSA id r194sm3400383pfr.168.2021.01.27.13.44.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jan 2021 13:44:48 -0800 (PST) From: Adam Harvey To: linux-cifs@vger.kernel.org, sfrench@samba.org Cc: smfrench@gmail.com, aaptel@suse.com, samba-technical@lists.samba.org, Adam Harvey Subject: [PATCH] cifs: ignore auto and noauto options if given Date: Wed, 27 Jan 2021 13:44:35 -0800 Message-Id: <20210127214434.3882-1-adam@adamharvey.name> X-Mailer: git-send-email 2.30.0 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org In 24e0a1eff9e2, the noauto and auto options were missed when migrating to the new mount API. As a result, users with noauto in their fstab mount options are now unable to mount cifs filesystems, as they'll receive an "Unknown parameter" error. This restores the old behaviour of ignoring noauto and auto if they're given. Fixes: 24e0a1eff9e2 ("cifs: switch to new mount api") Signed-off-by: Adam Harvey --- fs/cifs/fs_context.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/cifs/fs_context.c b/fs/cifs/fs_context.c index 076bcadc756a..62818b142e2e 100644 --- a/fs/cifs/fs_context.c +++ b/fs/cifs/fs_context.c @@ -175,6 +175,7 @@ const struct fs_parameter_spec smb3_fs_parameters[] = { fsparam_flag_no("exec", Opt_ignore), fsparam_flag_no("dev", Opt_ignore), fsparam_flag_no("mand", Opt_ignore), + fsparam_flag_no("auto", Opt_ignore), fsparam_string("cred", Opt_ignore), fsparam_string("credentials", Opt_ignore), {}