From mboxrd@z Thu Jan 1 00:00:00 1970 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=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham 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 EF562C282C4 for ; Mon, 4 Feb 2019 10:56:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BC94120823 for ; Mon, 4 Feb 2019 10:56:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549277798; bh=/O0fKVQnv6mUP6gCDk8Ofyq+Zlpyry0CLxDJ0VCY9bw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=j3HF0CrE2kpjWNDfEOm9QFi9o4h7AIEtxAtWuepgeqRuANgYKiOjxYSOk2ugoaVVW CM5V4AnXxc/mlunzgSJv3qwf6//bWDEnwDe9nbTt/6Wkid8ks0/JJBLqUoCNJYJTZq 2qyHrmGue6TI2KtAfmmYecpG4jGLSVYWFjr1q+pg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732699AbfBDK4g (ORCPT ); Mon, 4 Feb 2019 05:56:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:50374 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732235AbfBDKwo (ORCPT ); Mon, 4 Feb 2019 05:52:44 -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 116712070C; Mon, 4 Feb 2019 10:52:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549277564; bh=/O0fKVQnv6mUP6gCDk8Ofyq+Zlpyry0CLxDJ0VCY9bw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wiSPOWz9byWW3vUWevy4nAtdLRJSAh6Xw0diI+HQe5qkmXoNuqhL7L+zm4Q3G58qY 1xVCI4Y2gcxmx+afse0cIiyTlviNd8rui6U1bGQADKzgXAMST4xK6bIDktnJGpjZ1i cZM+AdW5+0QQYaqK8OJZtwq5f5u01p9K784r6CQ0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pavel Shilovsky , Steve French Subject: [PATCH 4.20 35/80] CIFS: Do not count -ENODATA as failure for query directory Date: Mon, 4 Feb 2019 11:36:55 +0100 Message-Id: <20190204103624.859264821@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190204103620.287366543@linuxfoundation.org> References: <20190204103620.287366543@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. ------------------ From: Pavel Shilovsky commit 8e6e72aeceaaed5aeeb1cb43d3085de7ceb14f79 upstream. Signed-off-by: Pavel Shilovsky Signed-off-by: Steve French CC: Stable Signed-off-by: Greg Kroah-Hartman --- fs/cifs/smb2pdu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -3726,8 +3726,8 @@ SMB2_query_directory(const unsigned int rsp->sync_hdr.Status == STATUS_NO_MORE_FILES) { srch_inf->endOfSearch = true; rc = 0; - } - cifs_stats_fail_inc(tcon, SMB2_QUERY_DIRECTORY_HE); + } else + cifs_stats_fail_inc(tcon, SMB2_QUERY_DIRECTORY_HE); goto qdir_exit; }