From: Al Viro <viro@www.linux.org.uk>
In open_namei() we never use path.mnt or path.dentry after exit: or ok:.
Assignment of path.dentry in case of LAST_BIND is dead code and only
obfuscates already convoluted function; assignment of path.mnt after
__do_follow_link() can be moved down to the place where we set path.dentry.
Obviously equivalent transformations, just to clean the air a bit in that
region.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
fs/namei.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff -puN fs/namei.c~namei-fixes-08-19 fs/namei.c
--- 25/fs/namei.c~namei-fixes-08-19 Fri May 20 15:42:16 2005
+++ 25-akpm/fs/namei.c Fri May 20 15:42:16 2005
@@ -1526,14 +1526,11 @@ do_link:
if (error)
goto exit_dput;
error = __do_follow_link(&path, nd);
- path.mnt = nd->mnt;
if (error)
return error;
nd->flags &= ~LOOKUP_PARENT;
- if (nd->last_type == LAST_BIND) {
- path.dentry = nd->dentry;
+ if (nd->last_type == LAST_BIND)
goto ok;
- }
error = -EISDIR;
if (nd->last_type != LAST_NORM)
goto exit;
@@ -1549,6 +1546,7 @@ do_link:
dir = nd->dentry;
down(&dir->d_inode->i_sem);
path.dentry = __lookup_hash(&nd->last, nd->dentry, nd);
+ path.mnt = nd->mnt;
putname(nd->last.name);
goto do_last;
}
_