mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-08 20:07:46 +09:00
Merge 035d80695f ("Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs") into android-mainline
Steps on the way to 5.12-rc7 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I3cd7beb6b194b27eea8150334a61470007be61b2
This commit is contained in:
@@ -2505,16 +2505,16 @@ static int path_lookupat(struct nameidata *nd, unsigned flags, struct path *path
|
||||
while (!(err = link_path_walk(s, nd)) &&
|
||||
(s = lookup_last(nd)) != NULL)
|
||||
;
|
||||
if (!err && unlikely(nd->flags & LOOKUP_MOUNTPOINT)) {
|
||||
err = handle_lookup_down(nd);
|
||||
nd->flags &= ~LOOKUP_JUMPED; // no d_weak_revalidate(), please...
|
||||
}
|
||||
if (!err)
|
||||
err = complete_walk(nd);
|
||||
|
||||
if (!err && nd->flags & LOOKUP_DIRECTORY)
|
||||
if (!d_can_lookup(nd->path.dentry))
|
||||
err = -ENOTDIR;
|
||||
if (!err && unlikely(nd->flags & LOOKUP_MOUNTPOINT)) {
|
||||
err = handle_lookup_down(nd);
|
||||
nd->flags &= ~LOOKUP_JUMPED; // no d_weak_revalidate(), please...
|
||||
}
|
||||
if (!err) {
|
||||
*path = nd->path;
|
||||
nd->path.mnt = NULL;
|
||||
|
||||
Reference in New Issue
Block a user