From patchwork Tue Jun 7 17:32:47 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Rees X-Patchwork-Id: 858492 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 p57HW4Eg020963 for ; Tue, 7 Jun 2011 17:32:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757388Ab1FGRct (ORCPT ); Tue, 7 Jun 2011 13:32:49 -0400 Received: from int-mailstore01.merit.edu ([207.75.116.232]:51600 "EHLO int-mailstore01.merit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755451Ab1FGRct (ORCPT ); Tue, 7 Jun 2011 13:32:49 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by int-mailstore01.merit.edu (Postfix) with ESMTP id C7A4D3083A6D; Tue, 7 Jun 2011 13:32:48 -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 ELlx90It9zFC; Tue, 7 Jun 2011 13:32:48 -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 5537D3055B74; Tue, 7 Jun 2011 13:32:48 -0400 (EDT) Date: Tue, 7 Jun 2011 13:32:47 -0400 From: Jim Rees To: Benny Halevy Cc: linux-nfs@vger.kernel.org, peter honeyman Subject: [PATCH 57/88] SQUASHME: pnfsblock: write_end_cleanup adjust for removed ok_to_use_pnfs Message-ID: <28b4f3b81ac3c03a110d6837773ba352dbd075b1.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:50 +0000 (UTC) From: Fred Isaman Signed-off-by: Fred Isaman --- fs/nfs/blocklayout/blocklayout.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c index b1df445..43a5617 100644 --- a/fs/nfs/blocklayout/blocklayout.c +++ b/fs/nfs/blocklayout/blocklayout.c @@ -1048,9 +1048,13 @@ bl_write_end_cleanup(struct file *filp, struct pnfs_fsdata *fsdata) sector_t *pos; struct address_space *mapping = filp->f_mapping; struct pnfs_fsdata *fake_data; + struct pnfs_layout_segment *lseg; if (!fsdata) return; + lseg = fsdata->lseg; + if (!lseg) + return; pos = fsdata->private; if (!pos) return; @@ -1079,7 +1083,8 @@ bl_write_end_cleanup(struct file *filp, struct pnfs_fsdata *fsdata) unlock_page(page); continue; } - fake_data->ok_to_use_pnfs = 1; + get_lseg(lseg); + fake_data->lseg = lseg; fake_data->bypass_eof = 1; mapping->a_ops->write_end(filp, mapping, index << PAGE_CACHE_SHIFT,