From patchwork Mon May 23 19:43:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boaz Harrosh X-Patchwork-Id: 809932 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 p4NJhVHr013306 for ; Mon, 23 May 2011 19:43:32 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756941Ab1EWTnb (ORCPT ); Mon, 23 May 2011 15:43:31 -0400 Received: from daytona.panasas.com ([67.152.220.89]:17509 "EHLO daytona.panasas.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756703Ab1EWTna (ORCPT ); Mon, 23 May 2011 15:43:30 -0400 Received: from fs2.bhalevy.com ([172.17.33.65]) by daytona.panasas.com with Microsoft SMTPSVC(6.0.3790.4675); Mon, 23 May 2011 15:43:29 -0400 Message-ID: <4DDAB8CC.5020004@panasas.com> Date: Mon, 23 May 2011 22:43:08 +0300 From: Boaz Harrosh User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.17) Gecko/20110430 Remi/fc12 Thunderbird/3.1.10 MIME-Version: 1.0 To: Benny Halevy CC: Trond Myklebust , linux-nfs@vger.kernel.org Subject: [PATCH] SQUASHME: into pnfs: pnfs: support for non-rpc layout drivers: de-ref not needed References: <4DDA8C3D.5080706@panasas.com> <1306168687-11649-1-git-send-email-bhalevy@panasas.com> <4DDAA30A.8090806@panasas.com> <4DDAB40E.3040205@panasas.com> In-Reply-To: <4DDAB40E.3040205@panasas.com> X-OriginalArrivalTime: 23 May 2011 19:43:30.0088 (UTC) FILETIME=[B12CCA80:01CC1981] 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]); Mon, 23 May 2011 19:43:32 +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 a5a0e73..e844cf0 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1130,8 +1130,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), @@ -1179,8 +1177,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),