Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp2481090imj; Mon, 18 Feb 2019 06:46:17 -0800 (PST) X-Google-Smtp-Source: AHgI3IZ49OiRcEvNBxusbpH0B/MThta80z1tVtTzxSFurEuoFHbx987V9cy1E4Otj+7XL0NRJtD4 X-Received: by 2002:aa7:81d7:: with SMTP id c23mr472167pfn.146.1550501177635; Mon, 18 Feb 2019 06:46:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550501177; cv=none; d=google.com; s=arc-20160816; b=i66J6lHycG2MSGiV5hT1IMpMmFb0cuCGPNBcO+s2hqkj4QAFaCE7qepX+M5vRsAMAV UTKalDuWnWvalICmkVEfcBuUZiuPLHVpybBoF326AUKC/pN8tBfHL2m2A3NCbEeVWxGC GDS9BjRVk+oCcRwiISDIiar55RFG3aKtGTGCGpLq1yjrXdRzv1cMQndyzUS6bMbJ66+5 acMYKytKLEmD78RabmamKf0hB/qvmxNq1J4qPra/F+sO63WT2pYEy4XhUyCkiL4QqXmS XNXsIvpfIGPlErjg2odyqobxKtdnJ2A4MDBzSvgvjijHu5Mj1EzP3SYaJsKWL2f842vC 79YA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+okqOLBY4766PssrGOcwlY/wlynaYl58bj3HGfx8IpQ=; b=hfwyvPUQM7Py/qevwqbV71PTmP2qQSZV0coSFEDI51s/kpb9nLHmMIO+3a0Uqypblv or7wGpaHuikT0lL5ikADIBgUZ2MLkxPaCWiU1FL8bkmMve2imsPkVVHO8mWB3OmUfuBz Qp+jenhIbg6OGa93hmtmoQ0vV1ZMpqwDMGKPPA0/ungPfk2WY08AJy/juQr5QxrCE/j+ Y4Kon+K75QpcSQNIF9+ERTDhFVREnItgTAxbeJS1SHVjTxTRNiob/2Ljy82LKb/tIWu7 yRxpfSwXOJzMbkeIgAz22/E3lyb4kI+EpS8eqGy/ZjdFY3mjkXFzyK9Plvn+kAOJPpG3 vtKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="yuuU/x4R"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a5si12550582pgw.155.2019.02.18.06.46.02; Mon, 18 Feb 2019 06:46:17 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="yuuU/x4R"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731777AbfBRNsG (ORCPT + 99 others); Mon, 18 Feb 2019 08:48:06 -0500 Received: from mail.kernel.org ([198.145.29.99]:53472 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731718AbfBRNq6 (ORCPT ); Mon, 18 Feb 2019 08:46:58 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (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 D1D7821900; Mon, 18 Feb 2019 13:46:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550497617; bh=VjxRX1tI0Y4RIHbnZc2KRdUQgYdEGH4fmoKHwmqfEu8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yuuU/x4RJcU1lnGR3YQwx0WwJBqeJ8l9S1nqPwi7Pf86+MivVMxw+7EE22iAz++kP YDLP1R7vZRGuy95WUC1tBoOwrGCZzxoSLNG6NrLdn6Yoz4+Xpfk8rvsNj1ac6fsmyF LgAdOHYqy1pRlBvOktCtTSm4CwsTdFS93ChTnjDo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pavel Shilovsky , Ronnie Sahlberg , Steve French , Sasha Levin Subject: [PATCH 4.20 48/92] CIFS: Fix mounts if the client is low on credits Date: Mon, 18 Feb 2019 14:42:51 +0100 Message-Id: <20190218133459.197379708@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190218133454.668268457@linuxfoundation.org> References: <20190218133454.668268457@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 6a9cbdd1ceca1dc2359ddf082efe61b97c3e752b ] If the server doesn't grant us at least 3 credits during the mount we won't be able to complete it because query path info operation requires 3 credits. Use the cached file handle if possible to allow the mount to succeed. Signed-off-by: Pavel Shilovsky Reviewed-by: Ronnie Sahlberg Signed-off-by: Steve French Signed-off-by: Sasha Levin --- fs/cifs/smb2inode.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/fs/cifs/smb2inode.c b/fs/cifs/smb2inode.c index a8999f930b22..057d2034209f 100644 --- a/fs/cifs/smb2inode.c +++ b/fs/cifs/smb2inode.c @@ -294,6 +294,8 @@ smb2_query_path_info(const unsigned int xid, struct cifs_tcon *tcon, int rc; struct smb2_file_all_info *smb2_data; __u32 create_options = 0; + struct cifs_fid fid; + bool no_cached_open = tcon->nohandlecache; *adjust_tz = false; *symlink = false; @@ -302,6 +304,21 @@ smb2_query_path_info(const unsigned int xid, struct cifs_tcon *tcon, GFP_KERNEL); if (smb2_data == NULL) return -ENOMEM; + + /* If it is a root and its handle is cached then use it */ + if (!strlen(full_path) && !no_cached_open) { + rc = open_shroot(xid, tcon, &fid); + if (rc) + goto out; + rc = SMB2_query_info(xid, tcon, fid.persistent_fid, + fid.volatile_fid, smb2_data); + close_shroot(&tcon->crfid); + if (rc) + goto out; + move_smb2_info_to_cifs(data, smb2_data); + goto out; + } + if (backup_cred(cifs_sb)) create_options |= CREATE_OPEN_BACKUP_INTENT; -- 2.19.1