Received: by 2002:ac0:8c9a:0:0:0:0:0 with SMTP id r26csp3664390ima; Mon, 4 Feb 2019 03:04:51 -0800 (PST) X-Google-Smtp-Source: ALg8bN5PpoyWAnnW4UzJavhIWs4hA4ttXg6jY6RMqIHL4oQ797jgByjQkd0OABGFt9DuQebFi7fb X-Received: by 2002:a17:902:9692:: with SMTP id n18mr52068116plp.333.1549278291064; Mon, 04 Feb 2019 03:04:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549278291; cv=none; d=google.com; s=arc-20160816; b=kB4o7a6/Q7g8P0Is30mJpf7GGl+FY1RVE4BfJArasGrwBbZcjKkN+eFVW+q2fkNiwt Phnq6p/XNYsPqO8yWVRySXoKBO7N8Qhlxv8DiH4mgQG5ryRYPn3mQosGxeLWDDrwuGPT 6agpnG44RkfBnITn6HrAX8zGFy1XViIdcCAsRq0paHqHqtnvAAMs7Bo5OXNEX5+DeoIh ECRziR6qzQ5EqIEa6w6omZ/WM6qC/eGN9EgRnvM70P9gx+oCvhlC9wG8NYDxAH+er+Jp WpU5o7y9GQCp4b1FLt4JkT7/Cawmq5C2YZElYEGJcT+0pdRUR29ZFoF8o4AkDZOUjvkY 4T2w== 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=Ykog4//9rM0APx8RV/CdXH45+x9uJI5I/P0Sx0sLtvM=; b=rJYVaIgewEh46lEqH/54NfaiphPOo48WatxTyiaEtW+DrVRFaJnZ2tGhwtAWoZnoSE kIw990HJmFsa5NV4SU8pUzvb7L40Qvi2ZGzofY7xWTzPkk6fyfRM2vqk6SXlC40wimbQ 7Jl95TINVTniSghbfaQzzuneVHOyg/xf5ohvgdm/bQcKldYq9nhCY+zyCxc6JlVERwwX JWUIXpZTu7sI4g6f4auUwlskBlTDCtqG59tolW0gJJY8kufTIfYAm4HF+hSY9VaDsAI/ biW8UDFrUJCQC9MkqJYOqMY5q8svYwlXR17aRfr1xxBOxGW64eONZbTlxnuPis/L3j0A OY/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=IFodIHOK; 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 m20si14272304pgk.323.2019.02.04.03.04.34; Mon, 04 Feb 2019 03:04:51 -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=IFodIHOK; 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 S1731396AbfBDKqY (ORCPT + 99 others); Mon, 4 Feb 2019 05:46:24 -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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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; }