While reviewing some code I realized that in getting d_automount working with s_user_ns I had left behind some unnecessary relics of the blind path I started down. Here are two patches that remove those relics. Unless someone has another preference I will drop them in my userns tree and merge them that way. Eric W. Biederman (2): userns: Don't fail follow_automount based on s_user_ns autofs4: Modify autofs_wait to use current_uid() and current_gid() fs/autofs4/waitq.c | 4 ++-- fs/namei.c | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-)