From patchwork Tue May 24 10:54:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boaz Harrosh X-Patchwork-Id: 811532 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 p4OAsxFE003347 for ; Tue, 24 May 2011 10:54:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753986Ab1EXKy6 (ORCPT ); Tue, 24 May 2011 06:54:58 -0400 Received: from daytona.panasas.com ([67.152.220.89]:36907 "EHLO daytona.panasas.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753933Ab1EXKy6 (ORCPT ); Tue, 24 May 2011 06:54:58 -0400 Received: from fs2.bhalevy.com ([172.17.33.64]) by daytona.panasas.com with Microsoft SMTPSVC(6.0.3790.4675); Tue, 24 May 2011 06:54:57 -0400 Message-ID: <4DDB8E68.2030504@panasas.com> Date: Tue, 24 May 2011 13:54:32 +0300 From: Boaz Harrosh User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.17) Gecko/20110430 Remi/fc12 Thunderbird/3.1.10 MIME-Version: 1.0 To: Benny Halevy , Trond Myklebust , NFS list Subject: [PATCH] pnfs: layout_driver MUST set .free_deviceid_node if using dev-cache References: <4DDB8DD1.20101@panasas.com> In-Reply-To: <4DDB8DD1.20101@panasas.com> X-OriginalArrivalTime: 24 May 2011 10:54:57.0419 (UTC) FILETIME=[055D45B0:01CC1A01] 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]); Tue, 24 May 2011 10:54:59 +0000 (UTC) A device cache is not a matter of memory store. It is a matter of mounting/login and unmounting/logout. So it is not logical to not set free_deviceid_node. Who will do the unmount? It is better to crash the developer then let him leak mounts. Signed-off-by: Boaz Harrosh --- fs/nfs/pnfs_dev.c | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) diff --git a/fs/nfs/pnfs_dev.c b/fs/nfs/pnfs_dev.c index 37ca215..1b592d9 100644 --- a/fs/nfs/pnfs_dev.c +++ b/fs/nfs/pnfs_dev.c @@ -163,10 +163,7 @@ nfs4_delete_deviceid(const struct pnfs_layoutdriver_type *ld, d = nfs4_unhash_put_deviceid(ld, clp, id); if (!d) return; - if (d->ld->free_deviceid_node) - d->ld->free_deviceid_node(d); - else - kfree(d); + d->ld->free_deviceid_node(d); } EXPORT_SYMBOL_GPL(nfs4_delete_deviceid); @@ -232,8 +229,7 @@ nfs4_put_deviceid_node(struct nfs4_deviceid_node *d) hlist_del_init_rcu(&d->node); spin_unlock(&nfs4_deviceid_lock); synchronize_rcu(); - if (d->ld->free_deviceid_node) - d->ld->free_deviceid_node(d); + d->ld->free_deviceid_node(d); return true; } EXPORT_SYMBOL_GPL(nfs4_put_deviceid_node); @@ -258,12 +254,8 @@ _deviceid_purge_client(const struct nfs_client *clp, long hash) synchronize_rcu(); hlist_for_each_entry_safe(d, n, next, &tmp, node) - if (atomic_dec_and_test(&d->ref)) { - if (d->ld->free_deviceid_node) - d->ld->free_deviceid_node(d); - else - kfree(d); - } + if (atomic_dec_and_test(&d->ref)) + d->ld->free_deviceid_node(d); } void