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=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS 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 87E75C282D7 for ; Sat, 2 Feb 2019 11:34:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 521F72081B for ; Sat, 2 Feb 2019 11:34:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549107270; bh=PRy+NksINykWnvcO7GNfvRkEhSsb+MC7v2owX6iSGdI=; h=Subject:To:Cc:From:Date:List-ID:From; b=KqdVcCUTmrKcS5aVIgj91tX+1VNuu4Yv87TkU9rDrMJwyNVq3KQQjWkkIBWQ5cerY WYVZ+d+Lmmas8AbeY3Jqi4cNirbJwJH77nz5twCclFPxzpIpmdwrKcrL4tUbjkw1Dq Tp8kF2g3771sEuHA+esAQJiKbRSSSmRK/Y7AM0YI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726757AbfBBLe3 (ORCPT ); Sat, 2 Feb 2019 06:34:29 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:33851 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726678AbfBBLe3 (ORCPT ); Sat, 2 Feb 2019 06:34:29 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id A004021448; Sat, 2 Feb 2019 06:34:28 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Sat, 02 Feb 2019 06:34:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=sp093Q l07wwZznG7kJgSuXOwpgrErb5WcJ9Eo9JDJV8=; b=YXgcX7t2hzkaPvvONTuBA2 vI79AHVVUziyx0PT2lhyfIMkRoIAdOwQ9soAh8zYvNLqafml4AKgakAGMZ9QWJMH kXBBtaMQ7KCNShkU6l2m5RhMcnyrdIDcVEBTAXtY7thzRTPsDcR6bBfJ4ryFi4oD wPNkiCNZhIHZDw+8vZzB8upwaPoQNYBeR73UORCO6j8hrLtOpG127idy44so0CI9 h2LuQ9GmVSDMl5zfINyzHqz0tIJR7qKMw8wKQuD4+txeIIZg1Yt1Yf+pNh6X7p9V 0BemNg8qxL5UxGNxW/qa4a4hUokGCIHEwLD3mro1ZTXmcWfwFcwaPWzyfziOlOGQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtledrkedtgdefudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthenuceurghilhhouhhtmecufedt tdenucenucfjughrpefuvffhfffkgggtgfesthekredttddtlfenucfhrhhomhepoehgrh gvghhkhheslhhinhhugihfohhunhgurghtihhonhdrohhrgheqnecukfhppeekfedrkeei rdekledruddtjeenucfrrghrrghmpehmrghilhhfrhhomhepghhrvghgsehkrhhorghhrd gtohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (5356596b.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id EC483100BA; Sat, 2 Feb 2019 06:34:27 -0500 (EST) Subject: FAILED: patch "[PATCH] CIFS: Do not consider -ENODATA as stat failure for reads" failed to apply to 4.20-stable tree To: pshilov@microsoft.com, stable@vger.kernel.org, stfrench@microsoft.com Cc: From: Date: Sat, 02 Feb 2019 12:34:26 +0100 Message-ID: <15491072667641@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.20-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 082aaa8700415f6471ec9c5ef0c8307ca214989a Mon Sep 17 00:00:00 2001 From: Pavel Shilovsky Date: Fri, 18 Jan 2019 15:54:34 -0800 Subject: [PATCH] CIFS: Do not consider -ENODATA as stat failure for reads When doing reads beyound the end of a file the server returns error STATUS_END_OF_FILE error which is mapped to -ENODATA. Currently we report it as a failure which confuses read stats. Change it to not consider -ENODATA as failure for stat purposes. Signed-off-by: Pavel Shilovsky Signed-off-by: Steve French CC: Stable diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index d858dc04fdc3..ef52d6642431 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -3241,7 +3241,7 @@ smb2_readv_callback(struct mid_q_entry *mid) rdata->mr = NULL; } #endif - if (rdata->result) { + if (rdata->result && rdata->result != -ENODATA) { cifs_stats_fail_inc(tcon, SMB2_READ_HE); trace_smb3_read_err(0 /* xid */, rdata->cfile->fid.persistent_fid,