Commit c53cd490 authored by Shaohua Li's avatar Shaohua Li Committed by Jens Axboe

kernfs: introduce kernfs_node_id

inode number and generation can identify a kernfs node. We are going to
export the identification by exportfs operations, so put ino and
generation into a separate structure. It's convenient when later patches
use the identification.
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarShaohua Li <shli@fb.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 319ba91d
...@@ -539,7 +539,7 @@ void kernfs_put(struct kernfs_node *kn) ...@@ -539,7 +539,7 @@ void kernfs_put(struct kernfs_node *kn)
} }
kfree(kn->iattr); kfree(kn->iattr);
spin_lock(&kernfs_idr_lock); spin_lock(&kernfs_idr_lock);
idr_remove(&root->ino_idr, kn->ino); idr_remove(&root->ino_idr, kn->id.ino);
spin_unlock(&kernfs_idr_lock); spin_unlock(&kernfs_idr_lock);
kmem_cache_free(kernfs_node_cache, kn); kmem_cache_free(kernfs_node_cache, kn);
...@@ -645,8 +645,8 @@ static struct kernfs_node *__kernfs_new_node(struct kernfs_root *root, ...@@ -645,8 +645,8 @@ static struct kernfs_node *__kernfs_new_node(struct kernfs_root *root,
idr_preload_end(); idr_preload_end();
if (ret < 0) if (ret < 0)
goto err_out2; goto err_out2;
kn->ino = ret; kn->id.ino = ret;
kn->generation = gen; kn->id.generation = gen;
/* /*
* set ino first. This barrier is paired with atomic_inc_not_zero in * set ino first. This barrier is paired with atomic_inc_not_zero in
...@@ -721,7 +721,7 @@ struct kernfs_node *kernfs_find_and_get_node_by_ino(struct kernfs_root *root, ...@@ -721,7 +721,7 @@ struct kernfs_node *kernfs_find_and_get_node_by_ino(struct kernfs_root *root,
* before 'count'. So if 'count' is uptodate, 'ino' should be uptodate, * before 'count'. So if 'count' is uptodate, 'ino' should be uptodate,
* hence we can use 'ino' to filter stale node. * hence we can use 'ino' to filter stale node.
*/ */
if (kn->ino != ino) if (kn->id.ino != ino)
goto out; goto out;
rcu_read_unlock(); rcu_read_unlock();
...@@ -1654,7 +1654,7 @@ static int kernfs_fop_readdir(struct file *file, struct dir_context *ctx) ...@@ -1654,7 +1654,7 @@ static int kernfs_fop_readdir(struct file *file, struct dir_context *ctx)
const char *name = pos->name; const char *name = pos->name;
unsigned int type = dt_type(pos); unsigned int type = dt_type(pos);
int len = strlen(name); int len = strlen(name);
ino_t ino = pos->ino; ino_t ino = pos->id.ino;
ctx->pos = pos->hash; ctx->pos = pos->hash;
file->private_data = pos; file->private_data = pos;
......
...@@ -895,7 +895,7 @@ static void kernfs_notify_workfn(struct work_struct *work) ...@@ -895,7 +895,7 @@ static void kernfs_notify_workfn(struct work_struct *work)
* have the matching @file available. Look up the inodes * have the matching @file available. Look up the inodes
* and generate the events manually. * and generate the events manually.
*/ */
inode = ilookup(info->sb, kn->ino); inode = ilookup(info->sb, kn->id.ino);
if (!inode) if (!inode)
continue; continue;
...@@ -903,7 +903,7 @@ static void kernfs_notify_workfn(struct work_struct *work) ...@@ -903,7 +903,7 @@ static void kernfs_notify_workfn(struct work_struct *work)
if (parent) { if (parent) {
struct inode *p_inode; struct inode *p_inode;
p_inode = ilookup(info->sb, parent->ino); p_inode = ilookup(info->sb, parent->id.ino);
if (p_inode) { if (p_inode) {
fsnotify(p_inode, FS_MODIFY | FS_EVENT_ON_CHILD, fsnotify(p_inode, FS_MODIFY | FS_EVENT_ON_CHILD,
inode, FSNOTIFY_EVENT_INODE, kn->name, 0); inode, FSNOTIFY_EVENT_INODE, kn->name, 0);
......
...@@ -220,7 +220,7 @@ static void kernfs_init_inode(struct kernfs_node *kn, struct inode *inode) ...@@ -220,7 +220,7 @@ static void kernfs_init_inode(struct kernfs_node *kn, struct inode *inode)
inode->i_private = kn; inode->i_private = kn;
inode->i_mapping->a_ops = &kernfs_aops; inode->i_mapping->a_ops = &kernfs_aops;
inode->i_op = &kernfs_iops; inode->i_op = &kernfs_iops;
inode->i_generation = kn->generation; inode->i_generation = kn->id.generation;
set_default_inode_attr(inode, kn->mode); set_default_inode_attr(inode, kn->mode);
kernfs_refresh_inode(kn, inode); kernfs_refresh_inode(kn, inode);
...@@ -266,7 +266,7 @@ struct inode *kernfs_get_inode(struct super_block *sb, struct kernfs_node *kn) ...@@ -266,7 +266,7 @@ struct inode *kernfs_get_inode(struct super_block *sb, struct kernfs_node *kn)
{ {
struct inode *inode; struct inode *inode;
inode = iget_locked(sb, kn->ino); inode = iget_locked(sb, kn->id.ino);
if (inode && (inode->i_state & I_NEW)) if (inode && (inode->i_state & I_NEW))
kernfs_init_inode(kn, inode); kernfs_init_inode(kn, inode);
......
...@@ -543,7 +543,7 @@ static inline bool cgroup_is_populated(struct cgroup *cgrp) ...@@ -543,7 +543,7 @@ static inline bool cgroup_is_populated(struct cgroup *cgrp)
/* returns ino associated with a cgroup */ /* returns ino associated with a cgroup */
static inline ino_t cgroup_ino(struct cgroup *cgrp) static inline ino_t cgroup_ino(struct cgroup *cgrp)
{ {
return cgrp->kn->ino; return cgrp->kn->id.ino;
} }
/* cft/css accessors for cftype->write() operation */ /* cft/css accessors for cftype->write() operation */
......
...@@ -95,6 +95,15 @@ struct kernfs_elem_attr { ...@@ -95,6 +95,15 @@ struct kernfs_elem_attr {
struct kernfs_node *notify_next; /* for kernfs_notify() */ struct kernfs_node *notify_next; /* for kernfs_notify() */
}; };
/* represent a kernfs node */
union kernfs_node_id {
struct {
u32 ino;
u32 generation;
};
u64 id;
};
/* /*
* kernfs_node - the building block of kernfs hierarchy. Each and every * kernfs_node - the building block of kernfs hierarchy. Each and every
* kernfs node is represented by single kernfs_node. Most fields are * kernfs node is represented by single kernfs_node. Most fields are
...@@ -131,11 +140,10 @@ struct kernfs_node { ...@@ -131,11 +140,10 @@ struct kernfs_node {
void *priv; void *priv;
union kernfs_node_id id;
unsigned short flags; unsigned short flags;
umode_t mode; umode_t mode;
unsigned int ino;
struct kernfs_iattrs *iattr; struct kernfs_iattrs *iattr;
u32 generation;
}; };
/* /*
......
...@@ -136,7 +136,7 @@ DEFINE_EVENT(writeback_dirty_inode_template, writeback_dirty_inode, ...@@ -136,7 +136,7 @@ DEFINE_EVENT(writeback_dirty_inode_template, writeback_dirty_inode,
static inline unsigned int __trace_wb_assign_cgroup(struct bdi_writeback *wb) static inline unsigned int __trace_wb_assign_cgroup(struct bdi_writeback *wb)
{ {
return wb->memcg_css->cgroup->kn->ino; return wb->memcg_css->cgroup->kn->id.ino;
} }
static inline unsigned int __trace_wbc_assign_cgroup(struct writeback_control *wbc) static inline unsigned int __trace_wbc_assign_cgroup(struct writeback_control *wbc)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment