From patchwork Thu Jul 21 19:34:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Rees X-Patchwork-Id: 997002 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p6LJYV0w015518 for ; Thu, 21 Jul 2011 19:34:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753757Ab1GUTex (ORCPT ); Thu, 21 Jul 2011 15:34:53 -0400 Received: from merit-proxy02.merit.edu ([207.75.116.194]:40489 "EHLO merit-proxy02.merit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753766Ab1GUTex (ORCPT ); Thu, 21 Jul 2011 15:34:53 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by merit-proxy02.merit.edu (Postfix) with ESMTP id ACA222039B0A; Thu, 21 Jul 2011 15:34:52 -0400 (EDT) X-Virus-Scanned: amavisd-new at merit-proxy02.merit.edu Received: from merit-proxy02.merit.edu ([127.0.0.1]) by localhost (merit-proxy02.merit.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qlzfBff-st+K; Thu, 21 Jul 2011 15:34:52 -0400 (EDT) Received: from merit.edu (castelmezzano.citi.umich.edu [141.212.112.22]) by merit-proxy02.merit.edu (Postfix) with ESMTPSA id 5367E2039B0B; Thu, 21 Jul 2011 15:34:52 -0400 (EDT) From: Jim Rees To: Trond Myklebust Cc: linux-nfs@vger.kernel.org, peter honeyman Subject: [PATCH v2 25/25] NFS41: Drop lseg ref before fallthru to MDS Date: Thu, 21 Jul 2011 15:34:25 -0400 Message-Id: <1311276865-29484-26-git-send-email-rees@umich.edu> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1311276865-29484-1-git-send-email-rees@umich.edu> References: <1311276865-29484-1-git-send-email-rees@umich.edu> 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]); Thu, 21 Jul 2011 19:34:55 +0000 (UTC) From: Peng Tao There is no need to keep lseg reference when read/write through MDS. This fixes a null pointer crash at nfs_post_op_update_inode_force_wcc because nfs4_proc_write_setup will unset wdata->res.fattr if wdata->lseg is not NULL. Signed-off-by: Peng Tao --- fs/nfs/pnfs.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 3b20753..fda3019 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1182,6 +1182,9 @@ pnfs_ld_write_done(struct nfs_write_data *data) dprintk("%s: pnfs_error=%d, retry via MDS\n", __func__, data->pnfs_error); + + put_lseg(data->lseg); + data->lseg = NULL; status = nfs_initiate_write(data, NFS_CLIENT(data->inode), data->mds_ops, NFS_FILE_SYNC); return status ? : -EAGAIN; @@ -1282,6 +1285,9 @@ pnfs_ld_read_done(struct nfs_read_data *data) dprintk("%s: pnfs_error=%d, retry via MDS\n", __func__, data->pnfs_error); + + put_lseg(data->lseg); + data->lseg = NULL; status = nfs_initiate_read(data, NFS_CLIENT(data->inode), data->mds_ops); return status ? : -EAGAIN;