Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1667088

[PATCH V3 01/12] kernfs: use idr instead of ida to manage inode number

Show all headers | View raw

From: Shaohua Li <shli@fb.com>

kernfs uses ida to manage inode number. The problem is we can't get
kernfs_node from inode number with ida. Switching to use idr, next patch
will add an API to get kernfs_node from inode number.

Signed-off-by: Shaohua Li <shli@fb.com>
---
 fs/kernfs/dir.c        | 17 ++++++++++++-----
 include/linux/kernfs.h |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
index db5900aaa..8ad7a17 100644
--- a/fs/kernfs/dir.c
+++ b/fs/kernfs/dir.c
@@ -21,6 +21,7 @@
 DEFINE_MUTEX(kernfs_mutex);
 static DEFINE_SPINLOCK(kernfs_rename_lock);	/* kn->parent and ->name */
 static char kernfs_pr_cont_buf[PATH_MAX];	/* protected by rename_lock */
+static DEFINE_SPINLOCK(kernfs_idr_lock);	/* root->ino_idr */
 
 #define rb_to_kn(X) rb_entry((X), struct kernfs_node, rb)
 
@@ -533,7 +534,9 @@ void kernfs_put(struct kernfs_node *kn)
 		simple_xattrs_free(&kn->iattr->xattrs);
 	}
 	kfree(kn->iattr);
-	ida_simple_remove(&root->ino_ida, kn->ino);
+	spin_lock(&kernfs_idr_lock);
+	idr_remove(&root->ino_idr, kn->ino);
+	spin_unlock(&kernfs_idr_lock);
 	kmem_cache_free(kernfs_node_cache, kn);
 
 	kn = parent;
@@ -542,7 +545,7 @@ void kernfs_put(struct kernfs_node *kn)
 			goto repeat;
 	} else {
 		/* just released the root kn, free @root too */
-		ida_destroy(&root->ino_ida);
+		idr_destroy(&root->ino_idr);
 		kfree(root);
 	}
 }
@@ -630,7 +633,11 @@ static struct kernfs_node *__kernfs_new_node(struct kernfs_root *root,
 	if (!kn)
 		goto err_out1;
 
-	ret = ida_simple_get(&root->ino_ida, 1, 0, GFP_KERNEL);
+	idr_preload(GFP_KERNEL);
+	spin_lock(&kernfs_idr_lock);
+	ret = idr_alloc(&root->ino_idr, kn, 1, 0, GFP_ATOMIC);
+	spin_unlock(&kernfs_idr_lock);
+	idr_preload_end();
 	if (ret < 0)
 		goto err_out2;
 	kn->ino = ret;
@@ -875,13 +882,13 @@ struct kernfs_root *kernfs_create_root(struct kernfs_syscall_ops *scops,
 	if (!root)
 		return ERR_PTR(-ENOMEM);
 
-	ida_init(&root->ino_ida);
+	idr_init(&root->ino_idr);
 	INIT_LIST_HEAD(&root->supers);
 
 	kn = __kernfs_new_node(root, "", S_IFDIR | S_IRUGO | S_IXUGO,
 			       KERNFS_DIR);
 	if (!kn) {
-		ida_destroy(&root->ino_ida);
+		idr_destroy(&root->ino_idr);
 		kfree(root);
 		return ERR_PTR(-ENOMEM);
 	}
diff --git a/include/linux/kernfs.h b/include/linux/kernfs.h
index a9b11b8..5f5d602 100644
--- a/include/linux/kernfs.h
+++ b/include/linux/kernfs.h
@@ -163,7 +163,7 @@ struct kernfs_root {
 	unsigned int		flags;	/* KERNFS_ROOT_* flags */
 
 	/* private fields, do not use outside kernfs proper */
-	struct ida		ino_ida;
+	struct idr		ino_idr;
 	struct kernfs_syscall_ops *syscall_ops;
 
 	/* list of kernfs_super_info of this root, protected by kernfs_mutex */
-- 
2.9.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH V3 00/12] blktrace: output cgroup info Shaohua Li <shli@kernel.org> - 2017-06-15 20:20 +0200
  [PATCH V3 10/12] block: call __bio_free in bio_endio Shaohua Li <shli@kernel.org> - 2017-06-15 20:20 +0200
  [PATCH V3 09/12] block: always attach cgroup info into bio Shaohua Li <shli@kernel.org> - 2017-06-15 20:20 +0200
    Re: [PATCH V3 09/12] block: always attach cgroup info into bio Tejun Heo <tj@kernel.org> - 2017-06-19 21:20 +0200
  [PATCH V3 02/12] kernfs: implement i_generation Shaohua Li <shli@kernel.org> - 2017-06-15 20:20 +0200
    Re: [PATCH V3 02/12] kernfs: implement i_generation Tejun Heo <tj@kernel.org> - 2017-06-19 21:00 +0200
  [PATCH V3 12/12] block: use standard blktrace API to output cgroup info for debug notes Shaohua Li <shli@kernel.org> - 2017-06-15 20:20 +0200
  [PATCH V3 11/12] blktrace: add an option to allow displying cgroup path Shaohua Li <shli@kernel.org> - 2017-06-15 20:20 +0200
    Re: [PATCH V3 11/12] blktrace: add an option to allow displying  cgroup path Tejun Heo <tj@kernel.org> - 2017-06-19 21:20 +0200
  [PATCH V3 06/12] kernfs: add exportfs operations Shaohua Li <shli@kernel.org> - 2017-06-15 20:20 +0200
    Re: [PATCH V3 06/12] kernfs: add exportfs operations Tejun Heo <tj@kernel.org> - 2017-06-19 21:10 +0200
  [PATCH V3 03/12] kernfs: add an API to get kernfs node from inode number Shaohua Li <shli@kernel.org> - 2017-06-15 20:20 +0200
    Re: [PATCH V3 03/12] kernfs: add an API to get kernfs node from  inode number Tejun Heo <tj@kernel.org> - 2017-06-19 21:10 +0200
  [PATCH V3 08/12] blktrace: export cgroup info in trace Shaohua Li <shli@kernel.org> - 2017-06-15 20:30 +0200
  [PATCH V3 01/12] kernfs: use idr instead of ida to manage inode number Shaohua Li <shli@kernel.org> - 2017-06-15 20:30 +0200
    Re: [PATCH V3 01/12] kernfs: use idr instead of ida to manage inode  number Tejun Heo <tj@kernel.org> - 2017-06-19 21:00 +0200

csiph-web