From patchwork Tue May 24 15:08:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boaz Harrosh X-Patchwork-Id: 812562 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4OF8cku030461 for ; Tue, 24 May 2011 15:09:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752785Ab1EXPJW (ORCPT ); Tue, 24 May 2011 11:09:22 -0400 Received: from daytona.panasas.com ([67.152.220.89]:46858 "EHLO daytona.panasas.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752695Ab1EXPJV (ORCPT ); Tue, 24 May 2011 11:09:21 -0400 Received: from fs2.bhalevy.com ([172.17.33.70]) by daytona.panasas.com with Microsoft SMTPSVC(6.0.3790.4675); Tue, 24 May 2011 11:09:20 -0400 From: Boaz Harrosh To: Benny Halevy , Trond Myklebust , NFS list Subject: [PATCH 11/12] SQUASHME: pnfs: Fall out from: non-rpc layout drivers Date: Tue, 24 May 2011 18:08:49 +0300 Message-Id: <1306249729-23485-1-git-send-email-bharrosh@panasas.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <4DDBC611.3050202@panasas.com> References: <4DDBC611.3050202@panasas.com> X-OriginalArrivalTime: 24 May 2011 15:09:20.0908 (UTC) FILETIME=[8F1CDCC0:01CC1A24] 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 (demeter2.kernel.org [140.211.167.43]); Tue, 24 May 2011 15:09:22 +0000 (UTC) the de-ref in pnfs_ld_read/write_done in the error case is not needed. I only tested the write path but I suspect it is all symetric Signed-off-by: Boaz Harrosh --- fs/nfs/pnfs.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 0f59802..1716621 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1069,8 +1069,6 @@ pnfs_ld_write_done(struct nfs_write_data *data) return 0; } - put_lseg(data->lseg); - data->lseg = NULL; dprintk("%s: pnfs_error=%d, retry via MDS\n", __func__, data->pnfs_error); status = nfs_initiate_write(data, NFS_CLIENT(data->inode), @@ -1118,8 +1116,6 @@ pnfs_ld_read_done(struct nfs_read_data *data) return 0; } - put_lseg(data->lseg); - data->lseg = NULL; dprintk("%s: pnfs_error=%d, retry via MDS\n", __func__, data->pnfs_error); status = nfs_initiate_read(data, NFS_CLIENT(data->inode),