* [PATCH 1/3] SQUSHME: pnfs: BUG in _deviceid_purge_client
2011-05-24 10:52 [PATCHS 0/3] Some more bugs in latest code + please help with last problem Boaz Harrosh
@ 2011-05-24 10:53 ` Boaz Harrosh
2011-05-24 10:54 ` [PATCH] pnfs: layout_driver MUST set .free_deviceid_node if using dev-cache Boaz Harrosh
2011-05-24 10:56 ` [PATCH 3/3] SQUASHME: pnfs-obj: objlayout wants to cache devices until unmount Boaz Harrosh
2 siblings, 0 replies; 4+ messages in thread
From: Boaz Harrosh @ 2011-05-24 10:53 UTC (permalink / raw)
To: Benny Halevy, Trond Myklebust, NFS list
The atomic_dec_and_test() returns *true* when zero. The !
belongs to atomic_dec(). Fixit
Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
---
fs/nfs/pnfs_dev.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fs/nfs/pnfs_dev.c b/fs/nfs/pnfs_dev.c
index 7e5542c..37ca215 100644
--- a/fs/nfs/pnfs_dev.c
+++ b/fs/nfs/pnfs_dev.c
@@ -258,7 +258,7 @@ _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 (atomic_dec_and_test(&d->ref)) {
if (d->ld->free_deviceid_node)
d->ld->free_deviceid_node(d);
else
--
1.7.2.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH] pnfs: layout_driver MUST set .free_deviceid_node if using dev-cache
2011-05-24 10:52 [PATCHS 0/3] Some more bugs in latest code + please help with last problem Boaz Harrosh
2011-05-24 10:53 ` [PATCH 1/3] SQUSHME: pnfs: BUG in _deviceid_purge_client Boaz Harrosh
@ 2011-05-24 10:54 ` Boaz Harrosh
2011-05-24 10:56 ` [PATCH 3/3] SQUASHME: pnfs-obj: objlayout wants to cache devices until unmount Boaz Harrosh
2 siblings, 0 replies; 4+ messages in thread
From: Boaz Harrosh @ 2011-05-24 10:54 UTC (permalink / raw)
To: Benny Halevy, Trond Myklebust, NFS list
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 <bharrosh@panasas.com>
---
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
--
1.7.2.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 3/3] SQUASHME: pnfs-obj: objlayout wants to cache devices until unmount
2011-05-24 10:52 [PATCHS 0/3] Some more bugs in latest code + please help with last problem Boaz Harrosh
2011-05-24 10:53 ` [PATCH 1/3] SQUSHME: pnfs: BUG in _deviceid_purge_client Boaz Harrosh
2011-05-24 10:54 ` [PATCH] pnfs: layout_driver MUST set .free_deviceid_node if using dev-cache Boaz Harrosh
@ 2011-05-24 10:56 ` Boaz Harrosh
2 siblings, 0 replies; 4+ messages in thread
From: Boaz Harrosh @ 2011-05-24 10:56 UTC (permalink / raw)
To: Benny Halevy, Trond Myklebust, NFS list
Take an extra reference on a device insert. So devices keep
around in the cache until nfs_client release.
(This was the behaviour of the old cache)
The extra reference will be removed in nfs4_deviceid_purge_client().
I tested this and it works perfectly.
TODO: Define an nfs4_get_deviceid()
Currently accessing did->ref directly
TODO: nfs4_insert_deviceid_node should check if there are too many
devices and start purging them. Say by longest time from last use.
Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
---
fs/nfs/objlayout/objio_osd.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/fs/nfs/objlayout/objio_osd.c b/fs/nfs/objlayout/objio_osd.c
index c09066f..47e8cb5 100644
--- a/fs/nfs/objlayout/objio_osd.c
+++ b/fs/nfs/objlayout/objio_osd.c
@@ -110,6 +110,7 @@ _dev_list_add(const struct nfs_server *nfss,
de = n;
}
+ atomic_inc(&de->id_node.ref);
return de;
}
--
1.7.2.3
^ permalink raw reply related [flat|nested] 4+ messages in thread