openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

9p: turn fid->dlist into hlist 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2013-02-27 22:51:08 -05:00
parent 634095dab2
commit c4d30967f3
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/9p/fid.c
View File

@ -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;

2
fs/9p/fid.h
View File

@ -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);

9
fs/9p/vfs_dentry.c
View File

@ -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;

2
include/net/9p/client.h
View File

@ -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 */
};
/**