From: andros@netapp.com Subject: [PATCH 14/16] SQUASHME pnfs-submit: remove put_layout from pnfs_free_layout Date: Wed, 7 Jul 2010 18:34:21 -0400 Message-ID: <1278542063-4009-15-git-send-email-andros@netapp.com> References: <1278542063-4009-1-git-send-email-andros@netapp.com> <1278542063-4009-2-git-send-email-andros@netapp.com> <1278542063-4009-3-git-send-email-andros@netapp.com> <1278542063-4009-4-git-send-email-andros@netapp.com> <1278542063-4009-5-git-send-email-andros@netapp.com> <1278542063-4009-6-git-send-email-andros@netapp.com> <1278542063-4009-7-git-send-email-andros@netapp.com> <1278542063-4009-8-git-send-email-andros@netapp.com> <1278542063-4009-9-git-send-email-andros@netapp.com> <1278542063-4009-10-git-send-email-andros@netapp.com> <1278542063-4009-11-git-send-email-andros@netapp.com> <1278542063-4009-12-git-send-email-andros@netapp.com> <1278542063-4009-13-git-send-email-andros@netapp.com> <1278542063-4009-14-git-send-email-andros@netapp.com> Cc: linux-nfs@vger.kernel.org, Andy Adamson To: bhalevy@panasas.com Return-path: Received: from mx2.netapp.com ([216.240.18.37]:43252 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757687Ab0GGWec (ORCPT ); Wed, 7 Jul 2010 18:34:32 -0400 In-Reply-To: <1278542063-4009-14-git-send-email-andros@netapp.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: From: Andy Adamson Signed-off-by: Andy Adamson --- fs/nfs/pnfs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 040f9e0..7631efe 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -402,6 +402,7 @@ pnfs_destroy_layout(struct nfs_inode *nfsi) __func__, nfsi->layout->refcount); WARN_ON(nfsi->layout->refcount != 1); + /* Matched by refcount set to 1 in alloc_init_layout */ put_layout_locked(lo); } spin_unlock(&nfsi->vfs_inode.i_lock); @@ -696,7 +697,6 @@ pnfs_free_layout(struct pnfs_layout_type *lo, spin_lock(&clp->cl_lock); list_del_init(&lo->lo_layouts); spin_unlock(&clp->cl_lock); - put_layout_locked(lo); } dprintk("%s:Return\n", __func__); -- 1.6.6