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=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 6A0D7C282C4 for ; Mon, 4 Feb 2019 11:03:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2F25B2073D for ; Mon, 4 Feb 2019 11:03:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549278225; bh=hta3ZSbf5CMBak88dvYkb/1napAG7FYGqi0gVaUs0eU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lzUVridlfGWnYqeYQPcQhX5NGdGeR9Ady24kb7ASbknN2vw2iJ6SQVXl1zSr2RkmM lCoFNOAb9l2xtWxrZPTx8m83jwj1scUxduH7J2+A7Ljf5Q15dwKDKa5f9ma9d/GPr1 gsbp7kP+KzsI1XTm5rCcL79ygyEUvK96th0l14DA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731382AbfBDKqX (ORCPT ); Mon, 4 Feb 2019 05:46:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:44594 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730939AbfBDKqW (ORCPT ); Mon, 4 Feb 2019 05:46:22 -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 8A0F02070C; Mon, 4 Feb 2019 10:46:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549277182; bh=hta3ZSbf5CMBak88dvYkb/1napAG7FYGqi0gVaUs0eU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IFodIHOK043R0C9f8XejHGwZv8mVMX1+UJFKzclIJ0Mb5Y3GU8uyJGltQkax39zJm b1ov4W/FcbzjAfxjPiXfZ03ka0T3aRK5TebCsszkfdF+r8vBscKhu0sFG1CAoNQ2JS Yk/VlxFPIwHBjfvCjcr+iXoJCmv8d2nkiJqjwbXM= 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.14 20/46] CIFS: Do not count -ENODATA as failure for query directory Date: Mon, 4 Feb 2019 11:36:51 +0100 Message-Id: <20190204103612.295332899@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190204103608.651205056@linuxfoundation.org> References: <20190204103608.651205056@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: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.14-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 @@ -3071,8 +3071,8 @@ SMB2_query_directory(const unsigned int rsp->hdr.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; }