From patchwork Tue Jun 7 17:32:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Rees X-Patchwork-Id: 858502 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p57HW4Eh020963 for ; Tue, 7 Jun 2011 17:32:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932108Ab1FGRc5 (ORCPT ); Tue, 7 Jun 2011 13:32:57 -0400 Received: from int-mailstore01.merit.edu ([207.75.116.232]:51646 "EHLO int-mailstore01.merit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755451Ab1FGRc5 (ORCPT ); Tue, 7 Jun 2011 13:32:57 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by int-mailstore01.merit.edu (Postfix) with ESMTP id 12C1F305A9CC; Tue, 7 Jun 2011 13:32:57 -0400 (EDT) X-Virus-Scanned: amavisd-new at int-mailstore01.merit.edu Received: from int-mailstore01.merit.edu ([127.0.0.1]) by localhost (int-mailstore01.merit.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hL5cP7m7A1-B; Tue, 7 Jun 2011 13:32:56 -0400 (EDT) Received: from merit.edu (host-17.subnet-17.med.umich.edu [141.214.17.17]) by int-mailstore01.merit.edu (Postfix) with ESMTPSA id 702C03055B74; Tue, 7 Jun 2011 13:32:55 -0400 (EDT) Date: Tue, 7 Jun 2011 13:32:54 -0400 From: Jim Rees To: Benny Halevy Cc: linux-nfs@vger.kernel.org, peter honeyman Subject: [PATCH 58/88] SQUASHME: pnfsblock: bl_write_pagelist support functions adjust for missing PG_USE_PNFS Message-ID: <69f4c98effee682abf2cbcda04b2def84bb1963c.1307464382.git.rees@umich.edu> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 07 Jun 2011 17:32:58 +0000 (UTC) From: Fred Isaman Signed-off-by: Fred Isaman --- fs/nfs/blocklayout/blocklayout.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c index 43a5617..77e9512 100644 --- a/fs/nfs/blocklayout/blocklayout.c +++ b/fs/nfs/blocklayout/blocklayout.c @@ -1115,12 +1115,10 @@ bl_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev, struct nfs_page *req) { dprintk("%s enter\n", __func__); - if (pgio->pg_iswrite) { - return test_bit(PG_USE_PNFS, &prev->wb_flags) == - test_bit(PG_USE_PNFS, &req->wb_flags); - } else { + if (pgio->pg_iswrite) + return prev->wb_lseg == req->wb_lseg; + else return 1; - } } static struct layoutdriver_io_operations blocklayout_io_operations = {