From patchwork Wed Jul 27 23:40:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Rees X-Patchwork-Id: 1014232 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6RNeH2u030584 for ; Wed, 27 Jul 2011 23:40:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753425Ab1G0Xkh (ORCPT ); Wed, 27 Jul 2011 19:40:37 -0400 Received: from merit-proxy01.merit.edu ([207.75.116.193]:52002 "EHLO merit-proxy01.merit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751435Ab1G0Xkg (ORCPT ); Wed, 27 Jul 2011 19:40:36 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by merit-proxy01.merit.edu (Postfix) with ESMTP id 427982039B07; Wed, 27 Jul 2011 19:40:36 -0400 (EDT) X-Virus-Scanned: amavisd-new at merit-proxy01.merit.edu Received: from merit-proxy01.merit.edu ([127.0.0.1]) by localhost (merit-proxy01.merit.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Xt-SQRCJsY2U; Wed, 27 Jul 2011 19:40:35 -0400 (EDT) Received: from merit.edu (modemcable010.3-70-69.static.videotron.ca [69.70.3.10]) by merit-proxy01.merit.edu (Postfix) with ESMTPSA id 851002039AFD; Wed, 27 Jul 2011 19:40:35 -0400 (EDT) Date: Wed, 27 Jul 2011 19:40:41 -0400 From: Jim Rees To: Boaz Harrosh Cc: Trond Myklebust , linux-nfs@vger.kernel.org, peter honeyman Subject: Re: [PATCH v3 03/25] NFS41: Let layoutcommit handle multiple segments Message-ID: <20110727234041.GC14319@merit.edu> References: <1311792048-12551-1-git-send-email-rees@umich.edu> <1311792048-12551-4-git-send-email-rees@umich.edu> <4E306F84.6030808@panasas.com> <1311798159.25645.32.camel@lade.trondhjem.org> <4E30762E.4000508@panasas.com> <20110727205804.GA13698@merit.edu> <4E307E6F.6090309@panasas.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <4E307E6F.6090309@panasas.com> 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]); Wed, 27 Jul 2011 23:40:38 +0000 (UTC) Boaz Harrosh wrote: On 07/27/2011 01:58 PM, Jim Rees wrote: > But I thought for simplicity since this patchset was reviewed then, I've > tested with this patch and it works good as well. If you are going to > break things up, I can test with the minimal patches and report what is > need in Stable. (Is anyone working on it?) > > We may have over-squashed that one for block layout. I can dig up the > original patches if necessary, but I'm guessing you probably have them. Please do. Because by now I'm confused. the first I discovered it was by git diff of a branch that worked. I lost tracked of where the code was originated from. Here is just the original multiple segments patch. This is from the 88-patch set I sent out before Bakeathon. I don't know if this would still apply separately. From fc3381fa66adfcee4203b5a55ca6605bcfc8dafb Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Tue, 31 May 2011 00:42:56 -0400 Subject: [PATCH 03/89] pnfs: let layoutcommit code handle multiple segments Some layout driver like block will have multiple segments. Generic code should be able to handle it. --- fs/nfs/pnfs.c | 15 ++++++++++++--- fs/nfs/pnfs.h | 1 + 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index e3d618b..c18cda0 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1193,10 +1193,18 @@ pnfs_try_to_read_data(struct nfs_read_data *rdata, static struct pnfs_layout_segment *pnfs_list_write_lseg(struct inode *inode) { struct pnfs_layout_segment *lseg, *rv = NULL; + loff_t max_pos = 0; + + list_for_each_entry(lseg, &NFS_I(inode)->layout->plh_segs, pls_list) { + if (lseg->pls_range.iomode == IOMODE_RW) { + if (max_pos < lseg->pls_end_pos) + max_pos = lseg->pls_end_pos; + if (test_and_clear_bit(NFS_LSEG_LAYOUTCOMMIT, &lseg->pls_flags)) + rv = lseg; + } + } + rv->pls_end_pos = max_pos; - list_for_each_entry(lseg, &NFS_I(inode)->layout->plh_segs, pls_list) - if (lseg->pls_range.iomode == IOMODE_RW) - rv = lseg; return rv; } @@ -1211,6 +1219,7 @@ pnfs_set_layoutcommit(struct nfs_write_data *wdata) if (!test_and_set_bit(NFS_INO_LAYOUTCOMMIT, &nfsi->flags)) { /* references matched in nfs4_layoutcommit_release */ get_lseg(wdata->lseg); + set_bit(NFS_LSEG_LAYOUTCOMMIT, &wdata->lseg->pls_flags); wdata->lseg->pls_lc_cred = get_rpccred(wdata->args.context->state->owner->so_cred); mark_as_dirty = true; diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h index 53819d0..c6a9af2 100644 --- a/fs/nfs/pnfs.h +++ b/fs/nfs/pnfs.h @@ -36,6 +36,7 @@ enum { NFS_LSEG_VALID = 0, /* cleared when lseg is recalled/returned */ NFS_LSEG_ROC, /* roc bit received from server */ + NFS_LSEG_LAYOUTCOMMIT, /* layoutcommit bit set for layoutcommit */ }; struct pnfs_layout_segment {