From patchwork Sat Jan 26 01:31:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tejun Heo X-Patchwork-Id: 2048941 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 1B2F23FDC4 for ; Sat, 26 Jan 2013 01:34:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755091Ab3AZBds (ORCPT ); Fri, 25 Jan 2013 20:33:48 -0500 Received: from mail-pb0-f42.google.com ([209.85.160.42]:44512 "EHLO mail-pb0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755015Ab3AZBbh (ORCPT ); Fri, 25 Jan 2013 20:31:37 -0500 Received: by mail-pb0-f42.google.com with SMTP id rp2so524741pbb.15 for ; Fri, 25 Jan 2013 17:31:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=ZZeeyU+Hb14H+7K5YJWGeD0bZSK7whzepZn61NLdnrU=; b=kOuhBV/ilyPdMFfpxCzd0BBQqWDJzkrDOnNCxB7Eqp4idGVR9Ir/nGXJzPRxZlie5B KrTRcPRblrbomtNmZ3mKpm/D/eSyxFBJTpqjBEp57Q/8/gmBft8SXP7wnIqZOVCnzGbX sRKRHzChKVHoLZLfB/N/4jYrhsk7OwON5FAvx6GhSmcis7aFVq9C2LgrIBPXVLLX+MMW zePJ/5sc0+vV6ePNGkR5vAsTDrmM1tWH7CyXoRC6znamYegIX2sHfFtF9W17QD4pIer9 JRHkbz5GEeII3gOvbdPHrMCdkOKJ3YKNGco5bizbTIdsOFCROIhp4PAu78WMAhSYk85z On2w== X-Received: by 10.66.79.202 with SMTP id l10mr17780319pax.36.1359163896613; Fri, 25 Jan 2013 17:31:36 -0800 (PST) Received: from htj.dyndns.org (c-69-181-251-227.hsd1.ca.comcast.net. [69.181.251.227]) by mx.google.com with ESMTPS id qh4sm1627305pbb.9.2013.01.25.17.31.35 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 25 Jan 2013 17:31:35 -0800 (PST) From: Tejun Heo To: akpm@linux-foundation.org Cc: rusty@rustcorp.com.au, linux-kernel@vger.kernel.org, Tejun Heo , "J. Bruce Fields" , linux-nfs@vger.kernel.org Subject: [PATCH 11/14] nfs: idr_destroy() no longer needs idr_remove_all() Date: Fri, 25 Jan 2013 17:31:09 -0800 Message-Id: <1359163872-1949-12-git-send-email-tj@kernel.org> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1359163872-1949-1-git-send-email-tj@kernel.org> References: <1359163872-1949-1-git-send-email-tj@kernel.org> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org idr_destroy() can destroy idr by itself and idr_remove_all() is being deprecated. Drop reference to idr_remove_all(). Note that the code wasn't completely correct before because idr_remove() on all entries doesn't necessarily release all idr_layers which could lead to memory leak. Signed-off-by: Tejun Heo Cc: "J. Bruce Fields" Cc: linux-nfs@vger.kernel.org Acked-by: Trond Myklebust --- This patch depends on an earlier idr patch and given the trivial nature of the patch, I think it would be best to route these together through -mm. Please holler if there's any objection. Thanks. fs/nfs/client.c | 1 - 1 file changed, 1 deletion(-) diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 9f3c664..84d8eae 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -197,7 +197,6 @@ error_0: EXPORT_SYMBOL_GPL(nfs_alloc_client); #if IS_ENABLED(CONFIG_NFS_V4) -/* idr_remove_all is not needed as all id's are removed by nfs_put_client */ void nfs_cleanup_cb_ident_idr(struct net *net) { struct nfs_net *nn = net_generic(net, nfs_net_id);