From patchwork Tue Jun 7 17:31:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Rees X-Patchwork-Id: 858362 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 p57HV9tp013288 for ; Tue, 7 Jun 2011 17:31:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932120Ab1FGRbO (ORCPT ); Tue, 7 Jun 2011 13:31:14 -0400 Received: from int-mailstore01.merit.edu ([207.75.116.232]:50967 "EHLO int-mailstore01.merit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932116Ab1FGRbN (ORCPT ); Tue, 7 Jun 2011 13:31:13 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by int-mailstore01.merit.edu (Postfix) with ESMTP id 402053055B74; Tue, 7 Jun 2011 13:31:13 -0400 (EDT) X-Virus-Scanned: amavisd-new at int-mailstore01.merit.edu Received: from int-mailstore01.merit.edu ([127.0.0.1]) by localhost (int-mailstore01.merit.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pG8p4ECH2FZu; Tue, 7 Jun 2011 13:31:12 -0400 (EDT) Received: from merit.edu (host-17.subnet-17.med.umich.edu [141.214.17.17]) by int-mailstore01.merit.edu (Postfix) with ESMTPSA id CF104305A9CC; Tue, 7 Jun 2011 13:31:12 -0400 (EDT) Date: Tue, 7 Jun 2011 13:31:12 -0400 From: Jim Rees To: Benny Halevy Cc: linux-nfs@vger.kernel.org, peter honeyman Subject: [PATCH 44/88] SQUASHME: pnfsblock: Wrong extent refcount in block extents list Message-ID: <41a3a9eeeac246e94bfcc17f3464e10b01a19866.1307464382.git.rees@umich.edu> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: 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, 07 Jun 2011 17:31:15 +0000 (UTC) From: Zhang Jingwang _prep_new_extent called kref_init to initialize extent's refcount to 1. After that, we shouldn't call kref_get to increase its refcount, because this extent is only referenced by the list. Signed-off-by: Zhang Jingwang Acked-by: Fred Isaman Signed-off-by: Benny Halevy --- fs/nfs/blocklayout/extents.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/fs/nfs/blocklayout/extents.c b/fs/nfs/blocklayout/extents.c index 288a38a..4722899 100644 --- a/fs/nfs/blocklayout/extents.c +++ b/fs/nfs/blocklayout/extents.c @@ -868,7 +868,6 @@ set_to_rw(struct pnfs_block_layout *bl, u64 offset, u64 length) offset - be->be_f_offset, PNFS_BLOCK_INVALID_DATA); children[i++] = e1; - kref_get(&e1->be_refcnt); print_bl_extent(e1); } else merge1 = e1; @@ -876,7 +875,6 @@ set_to_rw(struct pnfs_block_layout *bl, u64 offset, u64 length) min(length, be->be_f_offset + be->be_length - offset), PNFS_BLOCK_READWRITE_DATA); children[i++] = e2; - kref_get(&e2->be_refcnt); print_bl_extent(e2); if (offset + length < be->be_f_offset + be->be_length) { _prep_new_extent(e3, be, e2->be_f_offset + e2->be_length, @@ -884,7 +882,6 @@ set_to_rw(struct pnfs_block_layout *bl, u64 offset, u64 length) offset - length, PNFS_BLOCK_INVALID_DATA); children[i++] = e3; - kref_get(&e3->be_refcnt); print_bl_extent(e3); } else merge2 = e3;