From patchwork Tue Oct 27 13:46:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 312043 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C8F56C55179 for ; Tue, 27 Oct 2020 17:26:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 894952076B for ; Tue, 27 Oct 2020 17:26:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603819609; bh=0YeDq31BLdUANo2Gvh0lwBsiRiQOzU5pl8c0EC/9zWs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tELh0nMQqR9mbW5gkLd99WUkWTZmWL0Z8S61Xk8WcM7yl4kO5F5GzEgpTjrb2U1Hc vkX5w20C+098umvSQFvCIdPIWkHFoqG3qUX55c482LbFrRBmA+f4eAuswUmrA65i1L 6SVy/tVcogodWZ6gbQqsuETlDURYZ/Z6SkvEiJsE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1773178AbgJ0Ox0 (ORCPT ); Tue, 27 Oct 2020 10:53:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:50206 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1772908AbgJ0Oub (ORCPT ); Tue, 27 Oct 2020 10:50:31 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 84CB4207DE; Tue, 27 Oct 2020 14:50:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603810231; bh=0YeDq31BLdUANo2Gvh0lwBsiRiQOzU5pl8c0EC/9zWs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Yao1p/pS8tz6ANqW6sbbztzbQKhm/rrOQWQuvzXtXyEzTUGAOJVt9KicgeD46KP4b c4yvW5EocXjytR9bhaXYA68fhLeUF2b8iZdo7qieKt4qym5uTyqXvkhgwJB8THYAFi gwFnq4DNYNyCg7vsXM+77SFcxO5LD4G+IMTtMAPA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Steve French Subject: [PATCH 5.8 066/633] smb3: do not try to cache root directory if dir leases not supported Date: Tue, 27 Oct 2020 14:46:49 +0100 Message-Id: <20201027135525.799197177@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135522.655719020@linuxfoundation.org> References: <20201027135522.655719020@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Steve French commit 3c6e65e679182d55779ef6f8582f0945af4319b0 upstream. To servers which do not support directory leases (e.g. Samba) it is wasteful to try to open_shroot (ie attempt to cache the root directory handle). Skip attempt to open_shroot when server does not indicate support for directory leases. Cuts the number of requests on mount from 17 to 15, and cuts the number of requests on stat of the root directory from 4 to 3. Signed-off-by: Steve French CC: Stable # v5.1+ Signed-off-by: Greg Kroah-Hartman --- fs/cifs/connect.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -3594,7 +3594,10 @@ cifs_get_tcon(struct cifs_ses *ses, stru */ tcon->retry = volume_info->retry; tcon->nocase = volume_info->nocase; - tcon->nohandlecache = volume_info->nohandlecache; + if (ses->server->capabilities & SMB2_GLOBAL_CAP_DIRECTORY_LEASING) + tcon->nohandlecache = volume_info->nohandlecache; + else + tcon->nohandlecache = 1; tcon->nodelete = volume_info->nodelete; tcon->local_lease = volume_info->local_lease; INIT_LIST_HEAD(&tcon->pending_opens);