9p: turn fid->dlist into hlist
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
diff --git a/fs/9p/fid.c b/fs/9p/fid.c
index 71bc36a..49de426 100644
--- a/fs/9p/fid.c
+++ b/fs/9p/fid.c
@@ -54,12 +54,12 @@
if (!dent)
return -ENOMEM;
- INIT_LIST_HEAD(&dent->fidlist);
+ INIT_HLIST_HEAD(&dent->fidlist);
dentry->d_fsdata = dent;
}
spin_lock(&dentry->d_lock);
- list_add(&fid->dlist, &dent->fidlist);
+ hlist_add_head(&fid->dlist, &dent->fidlist);
spin_unlock(&dentry->d_lock);
return 0;
@@ -84,8 +84,9 @@
dent = (struct v9fs_dentry *) dentry->d_fsdata;
ret = NULL;
if (dent) {
+ struct hlist_node *n;
spin_lock(&dentry->d_lock);
- list_for_each_entry(fid, &dent->fidlist, dlist) {
+ hlist_for_each_entry(fid, n, &dent->fidlist, dlist) {
if (any || uid_eq(fid->uid, uid)) {
ret = fid;
break;
diff --git a/fs/9p/fid.h b/fs/9p/fid.h
index 469b5d5..86eeb34 100644
--- a/fs/9p/fid.h
+++ b/fs/9p/fid.h
@@ -40,7 +40,7 @@
* Design and Implementation of the Linux 9P File System documentation
*/
struct v9fs_dentry {
- struct list_head fidlist;
+ struct hlist_head fidlist;
};
struct p9_fid *v9fs_fid_lookup(struct dentry *dentry);
diff --git a/fs/9p/vfs_dentry.c b/fs/9p/vfs_dentry.c
index 9ad6862..fcd4983 100644
--- a/fs/9p/vfs_dentry.c
+++ b/fs/9p/vfs_dentry.c
@@ -84,16 +84,13 @@
static void v9fs_dentry_release(struct dentry *dentry)
{
struct v9fs_dentry *dent;
- struct p9_fid *temp, *current_fid;
-
p9_debug(P9_DEBUG_VFS, " dentry: %s (%p)\n",
dentry->d_name.name, dentry);
dent = dentry->d_fsdata;
if (dent) {
- list_for_each_entry_safe(current_fid, temp, &dent->fidlist,
- dlist) {
- p9_client_clunk(current_fid);
- }
+ struct hlist_node *p, *n;
+ hlist_for_each_safe(p, n, &dent->fidlist)
+ p9_client_clunk(hlist_entry(p, struct p9_fid, dlist));
kfree(dent);
dentry->d_fsdata = NULL;
diff --git a/include/net/9p/client.h b/include/net/9p/client.h
index 5ff70f4..4c7c01a 100644
--- a/include/net/9p/client.h
+++ b/include/net/9p/client.h
@@ -192,7 +192,7 @@
void *rdir;
struct list_head flist;
- struct list_head dlist; /* list of all fids attached to a dentry */
+ struct hlist_node dlist; /* list of all fids attached to a dentry */
};
/**