From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:43790 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751237AbbEBSAG (ORCPT ); Sat, 2 May 2015 14:00:06 -0400 Subject: Patch "nfs: remove WARN_ON_ONCE from nfs_direct_good_bytes" has been added to the 4.0-stable tree To: tao.peng@primarydata.com, dros@primarydata.com, gregkh@linuxfoundation.org, jean@primarydata.com, trond.myklebust@primarydata.com Cc: , From: Date: Sat, 02 May 2015 19:59:31 +0200 Message-ID: <143058957124063@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 List-ID: This is a note to let you know that I've just added the patch titled nfs: remove WARN_ON_ONCE from nfs_direct_good_bytes to the 4.0-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: nfs-remove-warn_on_once-from-nfs_direct_good_bytes.patch and it can be found in the queue-4.0 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 05f54903d9d370a4cd302a85681304d3ec59e5c1 Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Thu, 9 Apr 2015 23:02:17 +0800 Subject: nfs: remove WARN_ON_ONCE from nfs_direct_good_bytes From: Peng Tao commit 05f54903d9d370a4cd302a85681304d3ec59e5c1 upstream. For flexfiles driver, we might choose to read from mirror index other than 0 while mirror_count is always 1 for read. Reported-by: Jean Spector Cc: Weston Andros Adamson Signed-off-by: Peng Tao Signed-off-by: Trond Myklebust Signed-off-by: Greg Kroah-Hartman --- fs/nfs/direct.c | 2 -- 1 file changed, 2 deletions(-) --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -129,8 +129,6 @@ nfs_direct_good_bytes(struct nfs_direct_ int i; ssize_t count; - WARN_ON_ONCE(hdr->pgio_mirror_idx >= dreq->mirror_count); - if (dreq->mirror_count == 1) { dreq->mirrors[hdr->pgio_mirror_idx].count += hdr->good_bytes; dreq->count += hdr->good_bytes; Patches currently in stable-queue which might be from tao.peng@primarydata.com are queue-4.0/nfs-fix-dio-good-bytes-calculation.patch queue-4.0/nfs-remove-warn_on_once-from-nfs_direct_good_bytes.patch