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

clean up the failure exits after __do_follow_link() in do_filp_open()

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2011-02-22 22:27:28 -05:00
parent 36f3b4f690
commit f1afe9efc8
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
fs/namei.c
View File

@@ -2426,15 +2426,12 @@ reval:
nd.flags |= LOOKUP_PARENT; nd.flags |= LOOKUP_PARENT;
error = __do_follow_link(&link, &nd, &cookie); error = __do_follow_link(&link, &nd, &cookie);
if (unlikely(error)) { if (unlikely(error)) {
if (!IS_ERR(cookie) && linki->i_op->put_link) filp = ERR_PTR(error);
linki->i_op->put_link(link.dentry, &nd, cookie); } else {
/* nd.path had been dropped */ nd.flags &= ~LOOKUP_PARENT;
nd.path = link; filp = do_last(&nd, &path, open_flag, acc_mode, mode, pathname);
goto out_path;
} }
nd.flags &= ~LOOKUP_PARENT; if (!IS_ERR(cookie) && linki->i_op->put_link)
filp = do_last(&nd, &path, open_flag, acc_mode, mode, pathname);
if (linki->i_op->put_link)
linki->i_op->put_link(link.dentry, &nd, cookie); linki->i_op->put_link(link.dentry, &nd, cookie);
path_put(&link); path_put(&link);
} }