hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kernfs: use idr instead of ida to manage inode number 

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.

Acked-by: Tejun Heo <tj@kernel.org>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Shaohua Li <shli@fb.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Shaohua Li 2017-07-12 11:49:46 -07:00 committed by Jens Axboe
parent 0a07b238e5
commit 7d35079f82
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fs/kernfs/dir.c
View File

@ -21,6 +21,7 @@
DEFINE_MUTEX(kernfs_mutex); DEFINE_MUTEX(kernfs_mutex);
static DEFINE_SPINLOCK(kernfs_rename_lock); /* kn->parent and ->name */ static DEFINE_SPINLOCK(kernfs_rename_lock); /* kn->parent and ->name */
static char kernfs_pr_cont_buf[PATH_MAX]; /* protected by rename_lock */ 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) #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); simple_xattrs_free(&kn->iattr->xattrs);
} }
kfree(kn->iattr); 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); kmem_cache_free(kernfs_node_cache, kn);
kn = parent; kn = parent;
@ -542,7 +545,7 @@ void kernfs_put(struct kernfs_node *kn)
goto repeat; goto repeat;
} else { } else {
/* just released the root kn, free @root too */ /* just released the root kn, free @root too */
ida_destroy(&root->ino_ida); idr_destroy(&root->ino_idr);
kfree(root); kfree(root);
} }
} }
@ -630,7 +633,11 @@ static struct kernfs_node *__kernfs_new_node(struct kernfs_root *root,
if (!kn) if (!kn)
goto err_out1; 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) if (ret < 0)
goto err_out2; goto err_out2;
kn->ino = ret; kn->ino = ret;
@ -875,13 +882,13 @@ struct kernfs_root *kernfs_create_root(struct kernfs_syscall_ops *scops,
if (!root) if (!root)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
ida_init(&root->ino_ida); idr_init(&root->ino_idr);
INIT_LIST_HEAD(&root->supers); INIT_LIST_HEAD(&root->supers);
kn = __kernfs_new_node(root, "", S_IFDIR | S_IRUGO | S_IXUGO, kn = __kernfs_new_node(root, "", S_IFDIR | S_IRUGO | S_IXUGO,
KERNFS_DIR); KERNFS_DIR);
if (!kn) { if (!kn) {
ida_destroy(&root->ino_ida); idr_destroy(&root->ino_idr);
kfree(root); kfree(root);
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
} }

2
include/linux/kernfs.h
View File

@ -163,7 +163,7 @@ struct kernfs_root {
unsigned int flags; /* KERNFS_ROOT_* flags */ unsigned int flags; /* KERNFS_ROOT_* flags */
/* private fields, do not use outside kernfs proper */ /* private fields, do not use outside kernfs proper */
struct ida ino_ida; struct idr ino_idr;
struct kernfs_syscall_ops *syscall_ops; struct kernfs_syscall_ops *syscall_ops;
/* list of kernfs_super_info of this root, protected by kernfs_mutex */ /* list of kernfs_super_info of this root, protected by kernfs_mutex */