redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

proc_fill_cache(): clean up, get rid of pointless find_inode_number() use 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
hifive-unleashed-5.1
Al Viro 2013-06-15 11:33:10 +04:00
parent c52a47ace7
commit 1df98b8bbc
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
fs/proc/base.c
View File

@ -1686,39 +1686,29 @@ bool proc_fill_cache(struct file *file, struct dir_context *ctx,
instantiate_t instantiate, struct task_struct *task, const void *ptr) instantiate_t instantiate, struct task_struct *task, const void *ptr)
{ {
struct dentry *child, *dir = file->f_path.dentry; struct dentry *child, *dir = file->f_path.dentry;
struct qstr qname = QSTR_INIT(name, len);
struct inode *inode; struct inode *inode;
struct qstr qname; unsigned type;
ino_t ino = 0; ino_t ino;
unsigned type = DT_UNKNOWN;
qname.name = name; child = d_hash_and_lookup(dir, &qname);
qname.len = len;
qname.hash = full_name_hash(name, len);
child = d_lookup(dir, &qname);
if (!child) { if (!child) {
struct dentry *new; child = d_alloc(dir, &qname);
new = d_alloc(dir, &qname); if (!child)
if (new) { goto end_instantiate;
child = ERR_PTR(instantiate(dir->d_inode, new, task, ptr)); if (instantiate(dir->d_inode, child, task, ptr) < 0) {
if (child) dput(child);
dput(new); goto end_instantiate;
else
child = new;
} }
} }
if (!child || IS_ERR(child) || !child->d_inode)
goto end_instantiate;
inode = child->d_inode; inode = child->d_inode;
ino = inode->i_ino; ino = inode->i_ino;
type = inode->i_mode >> 12; type = inode->i_mode >> 12;
dput(child); dput(child);
end_instantiate:
if (!ino)
ino = find_inode_number(dir, &qname);
if (!ino)
ino = 1;
return dir_emit(ctx, name, len, ino, type); return dir_emit(ctx, name, len, ino, type);
end_instantiate:
return dir_emit(ctx, name, len, 1, DT_UNKNOWN);
} }
#ifdef CONFIG_CHECKPOINT_RESTORE #ifdef CONFIG_CHECKPOINT_RESTORE