Commit 4189b863 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'work.lookup' of git://

Pull proc_fill_cache regression fix from Al Viro:
 "Regression fix for proc_fill_cache() braino introduced when switching
  instantiate() callback to d_splice_alias()"

* 'work.lookup' of git://
  fix proc_fill_cache() in case of d_alloc_parallel() failure
parents a94fc25b d85b399b
......@@ -1866,19 +1866,19 @@ bool proc_fill_cache(struct file *file, struct dir_context *ctx,
struct dentry *res;
res = instantiate(child, task, ptr);
if (IS_ERR(res))
goto end_instantiate;
if (unlikely(res)) {
child = res;
if (IS_ERR(child))
goto end_instantiate;
inode = d_inode(child);
ino = inode->i_ino;
type = inode->i_mode >> 12;
return dir_emit(ctx, name, len, ino, type);
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