Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'work.lookup' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

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://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix proc_fill_cache() in case of d_alloc_parallel() failure
parents a94fc25b d85b399b

fs/proc/base.c

+3 −3
Original line number Diff line number Diff line
@@ -1866,19 +1866,19 @@ bool proc_fill_cache(struct file *file, struct dir_context *ctx, 
			struct dentry *res;

			res = instantiate(child, task, ptr);

			d_lookup_done(child);

			if (IS_ERR(res))

				goto end_instantiate;

			if (unlikely(res)) {

				dput(child);

				child = res;

				if (IS_ERR(child))

					goto end_instantiate;

			}

		}

	}

	inode = d_inode(child);

	ino = inode->i_ino;

	type = inode->i_mode >> 12;

end_instantiate:

	dput(child);

end_instantiate:

	return dir_emit(ctx, name, len, ino, type);

}