Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4d30967 authored by Al Viro's avatar Al Viro
Browse files

9p: turn fid->dlist into hlist 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 634095da

fs/9p/fid.c

+4 −3
Original line number Diff line number Diff line
@@ -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;

fs/9p/fid.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

fs/9p/vfs_dentry.c

+3 −6
Original line number Diff line number Diff line
@@ -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;

include/net/9p/client.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */

};



/**