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 71bc36a03e72292f4067c717b774bc391bd90088..49de4264db9a82463928f11e3def17e4068de575 100644 (file)
--- a/fs/9p/fid.c
+++ b/fs/9p/fid.c
@@ -54,12 +54,12 @@ int v9fs_fid_add(struct dentry *dentry, struct p9_fid *fid)
                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 @@ static struct p9_fid *v9fs_fid_find(struct dentry *dentry, kuid_t uid, int any)
        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 469b5d5176947a8e59d54747bf3fca310beed4da..86eeb34ce46f4c564799a583b5bd4ffbd1dbe83d 100644 (file)
--- 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 9ad68628522c36b9b1a3dadc25db4d5b977ae5a3..fcd49833ef80179800dedb718ca8dbefd4f3a97a 100644 (file)
--- a/fs/9p/vfs_dentry.c
+++ b/fs/9p/vfs_dentry.c
@@ -84,16 +84,13 @@ static int v9fs_cached_dentry_delete(const struct dentry *dentry)
 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 5ff70f433e873f38f4459f236e80605948251072..4c7c01a73911d3a1ee06a6bed39d5fa90e503fa8 100644 (file)
--- a/include/net/9p/client.h
+++ b/include/net/9p/client.h
@@ -192,7 +192,7 @@ struct p9_fid {
        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 */
 };
 
 /**