lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

simplify link_path_walk() tail

Browse Source 
Now that link_path_walk() is called without LOOKUP_PARENT
only from do_follow_link(), we can simplify the checks in
last component handling.  First of all, checking if we'd
arrived to a directory is not needed - the caller will check
it anyway.  And LOOKUP_FOLLOW is guaranteed to be there,
since we only get to that place with nd->depth > 0.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2011-03-14 21:28:04 -04:00
parent bd92d7fed8
commit ce0525449d
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fs/namei.c
View File

@@ -1467,8 +1467,7 @@ last_component:
nd->last_type = type; nd->last_type = type;
return 0; return 0;
} }
err = walk_component(nd, &next, &this, type, err = walk_component(nd, &next, &this, type, LOOKUP_FOLLOW);
lookup_flags & LOOKUP_FOLLOW);
if (err < 0) if (err < 0)
return err; return err;
if (err) { if (err) {
@@ -1476,11 +1475,6 @@ last_component:
if (err) if (err)
return err; return err;
} }
if (lookup_flags & LOOKUP_DIRECTORY) {
err = -ENOTDIR;
if (!nd->inode->i_op->lookup)
break;
}
return 0; return 0;
} }
terminate_walk(nd); terminate_walk(nd);