From patchwork Thu Feb 24 10:11:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Adamson X-Patchwork-Id: 590731 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 p1PHvZoP032186 for ; Fri, 25 Feb 2011 17:57:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754455Ab1BYR5e (ORCPT ); Fri, 25 Feb 2011 12:57:34 -0500 Received: from mx2.netapp.com ([216.240.18.37]:15993 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753434Ab1BYR5e (ORCPT ); Fri, 25 Feb 2011 12:57:34 -0500 X-IronPort-AV: E=Sophos;i="4.62,226,1297065600"; d="scan'208";a="523227745" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 25 Feb 2011 09:57:33 -0800 Received: from netapp17.cthon.org ([10.58.63.12]) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id p1PHuvhP003854; Fri, 25 Feb 2011 09:57:17 -0800 (PST) From: andros@netapp.com To: iisaman@netapp.com Cc: linux-nfs@vger.kernel.org, Andy Adamson Subject: [PATCH 4/4] SQUASHME put_lseg before setting pointer to NULL Date: Thu, 24 Feb 2011 05:11:09 -0500 Message-Id: <1298542269-2477-4-git-send-email-andros@netapp.com> X-Mailer: git-send-email 1.7.4 In-Reply-To: <1298542269-2477-1-git-send-email-andros@netapp.com> References: <1298542269-2477-1-git-send-email-andros@netapp.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]); Fri, 25 Feb 2011 17:57:36 +0000 (UTC) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 58217dd..cbeb873 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -910,8 +910,8 @@ pnfs_try_to_write_data(struct nfs_write_data *wdata, trypnfs = nfss->pnfs_curr_ld->write_pagelist(wdata, how); if (trypnfs == PNFS_NOT_ATTEMPTED) { - wdata->lseg = NULL; put_lseg(wdata->lseg); + wdata->lseg = NULL; } else nfs_inc_stats(inode, NFSIOS_PNFS_WRITE);