From patchwork Sat Dec 22 00:48:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Bruce Fields" X-Patchwork-Id: 1904921 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 6C1FDDFE86 for ; Sat, 22 Dec 2012 00:49:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751427Ab2LVAtF (ORCPT ); Fri, 21 Dec 2012 19:49:05 -0500 Received: from fieldses.org ([174.143.236.118]:45043 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751445Ab2LVAtD (ORCPT ); Fri, 21 Dec 2012 19:49:03 -0500 Received: from bfields by fieldses.org with local (Exim 4.76) (envelope-from ) id 1TmDGt-0007vA-Gm; Fri, 21 Dec 2012 19:48:59 -0500 Date: Fri, 21 Dec 2012 19:48:59 -0500 From: "J. Bruce Fields" To: Linus Torvalds Cc: Dave Jones , Linux Kernel , linux-nfs@vger.kernel.org, Weston Andros Adamson , Trond Myklebust Subject: [PATCH] Revert "nfsd: warn on odd reply state in nfsd_vfs_read" Message-ID: <20121222004859.GA30312@fieldses.org> References: <20121221153348.GA32151@redhat.com> <20121221180824.GA27729@fieldses.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20121221180824.GA27729@fieldses.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: "J. Bruce Fields" This reverts commit 79f77bf9a4e3dd5ead006b8f17e7c4ff07d8374e. This is obviously wrong, and I have no idea how I missed seeing the warning in testing: I must just not have looked at the right logs. The caller bumps rq_resused/rq_next_page, so it will always be hit on a large enough read. Reported-by: Dave Jones Signed-off-by: J. Bruce Fields --- fs/nfsd/vfs.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index f0a6d88..d586117 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -934,7 +934,6 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file, .u.data = rqstp, }; - WARN_ON_ONCE(rqstp->rq_next_page != rqstp->rq_respages + 1); rqstp->rq_next_page = rqstp->rq_respages + 1; host_err = splice_direct_to_actor(file, &sd, nfsd_direct_splice_actor); } else {