From patchwork Fri Feb 1 20:03:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Shilovsky X-Patchwork-Id: 1035124 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-cifs-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qgv6UH/j"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43rp3K1dSfz9s6w for ; Sat, 2 Feb 2019 07:04:29 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730653AbfBAUE2 (ORCPT ); Fri, 1 Feb 2019 15:04:28 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:32836 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729192AbfBAUE2 (ORCPT ); Fri, 1 Feb 2019 15:04:28 -0500 Received: by mail-pf1-f195.google.com with SMTP id c123so3755333pfb.0 for ; Fri, 01 Feb 2019 12:04:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=fcJzqbKcJhEcAUtDF+x6Y9SMilRLQMqUU4J04Yn29FE=; b=qgv6UH/jlsWJnqxAF4lOjIS+kAUaR7FqDwYfI+HbAlkei2ePhumi4OaS3ShTfB455S RUKmIin05ecwwxqATZaqm6BiGYVCfhvh66noomNMBJsWER3vR9jRWGKSzKoy8m+jVdfv Qa/aPwpwj1DGyHNCcqOgfGJjdiVkHlYYkWdtPtjzZ211/+fnVDfFEB4wtaP2qN4xH6gX 1qlYQ+suRmQkQH+1yV2V95+KNMuobJFDtnPZeQsE7Ui29H7KTMaSsCeQ6cFj3MU+HuR9 E22XNBo/mb7duKAZluD801FcZCiDkAc1+uIrxvQFbR5XtdIdeEhoQKjCfpqqkUsCC1dN HlmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=fcJzqbKcJhEcAUtDF+x6Y9SMilRLQMqUU4J04Yn29FE=; b=VkmwBsagWyQsJ5V4hy+HVSozjAqO0F+2jhe6oYwv1HSBGDB7iLe08GW2q/824qD65C HOZZ8Nwp4MYM9YBE1aMfdAPWRIzy0pWxiJgf8756qnFU+BaAZv5vlzNvg0Ond+PXlzaM 44iVtwNR8uNOlyT5lJ9DJUDUVOowAUDH/4HvYdCPFOvvsGtECnDQk8toH6tecVo7i5ub InBCnpw+5u63FWyzZrFKg9rxxpxc8cfJBWAV9PIGzqVpklYLwpeKUFKlNqTyg7gufLe9 9oJW470A0WBE64Z8KHBBarE/rmjpFWtv66K/zeCX7P/DbUg/1zZUyND5FQQgU+HqyeFi ZMmw== X-Gm-Message-State: AHQUAuaEojGcEehhHscg7nRXppG6GozL0lVgQJ/c1yHff36m85DMT5vd eSjQlg+8/R+zGrvcPm4JM8zyqVE= X-Google-Smtp-Source: AHgI3Ib3ljjOzXjDO8EFtFHRAg0omJOAsWaIu9/nRmy87sd3w/aGPg5zji0P1EyKFibA/U5NMVsevg== X-Received: by 2002:a63:ee0e:: with SMTP id e14mr3483191pgi.8.1549051466825; Fri, 01 Feb 2019 12:04:26 -0800 (PST) Received: from ubuntu-vm.corp.microsoft.com ([2001:4898:80e8:0:a18e:4e9f:6b7c:507d]) by smtp.gmail.com with ESMTPSA id x11sm24247451pfe.72.2019.02.01.12.04.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Feb 2019 12:04:26 -0800 (PST) From: Pavel Shilovsky X-Google-Original-From: Pavel Shilovsky To: linux-cifs@vger.kernel.org Subject: [PATCH 04/23] CIFS: Do not consider -ENODATA as stat failure for reads Date: Fri, 1 Feb 2019 12:03:52 -0800 Message-Id: <1549051452-5968-5-git-send-email-pshilov@microsoft.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1549051452-5968-1-git-send-email-pshilov@microsoft.com> References: <1549051452-5968-1-git-send-email-pshilov@microsoft.com> Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org 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 --- fs/cifs/smb2pdu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index d858dc0..ef52d66 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,