From patchwork Mon Feb 14 19:18:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Adamson X-Patchwork-Id: 556561 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 p1EJIhtF015648 for ; Mon, 14 Feb 2011 19:18:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752637Ab1BNTSo (ORCPT ); Mon, 14 Feb 2011 14:18:44 -0500 Received: from mx2.netapp.com ([216.240.18.37]:41287 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752333Ab1BNTSn (ORCPT ); Mon, 14 Feb 2011 14:18:43 -0500 X-IronPort-AV: E=Sophos;i="4.60,469,1291622400"; d="scan'208";a="518337325" Received: from smtp1.corp.netapp.com ([10.57.156.124]) by mx2-out.netapp.com with ESMTP; 14 Feb 2011 11:18:43 -0800 Received: from fedora-3.dros.org (beaupre2-lxp.hq.netapp.com [10.58.48.75]) by smtp1.corp.netapp.com (8.13.1/8.13.1/NTAP-1.6) with ESMTP id p1EJIfb7024294; Mon, 14 Feb 2011 11:18:43 -0800 (PST) From: andros@netapp.com To: trond.myklebust@netapp.com Cc: linux-nfs@vger.kernel.org, Andy Adamson Subject: [PATCH 02/16] NFS put_layout_hdr can remove nfsi->layout Date: Mon, 14 Feb 2011 14:18:22 -0500 Message-Id: <1297711116-3139-3-git-send-email-andros@netapp.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1297711116-3139-1-git-send-email-andros@netapp.com> References: <1297711116-3139-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]); Mon, 14 Feb 2011 19:18:45 +0000 (UTC) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 0f5b66f..7d031cd 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -768,7 +768,7 @@ pnfs_update_layout(struct inode *ino, put_layout_hdr(lo); out: dprintk("%s end, state 0x%lx lseg %p\n", __func__, - nfsi->layout->plh_flags, lseg); + nfsi->layout ? nfsi->layout->plh_flags : -1, lseg); return lseg; out_unlock: spin_unlock(&ino->i_lock);