| commit | 3d8a00d2099ebc6d5a6e95fadaf861709d9919a8 | [log] [tgz] |
|---|---|---|
| author | Al Viro <viro@zeniv.linux.org.uk> | Sun Jun 10 05:04:43 2012 -0400 |
| committer | Al Viro <viro@zeniv.linux.org.uk> | Sat Jul 14 16:33:33 2012 +0400 |
| tree | 317bfb9d71e3ef35746685c6da2397545917d81e | |
| parent | 47237687d73cbeae1dd7a133c3fc3d7239094568 [diff] [blame] |
don't modify od->filp at all make put_filp() conditional on flag set by finish_open() Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
diff --git a/fs/namei.c b/fs/namei.c index 7a33f07..18b9326 100644 --- a/fs/namei.c +++ b/fs/namei.c
@@ -2708,10 +2708,8 @@ path_put(&nd->root); if (base) fput(base); - if (od.filp) { - BUG_ON(od.filp->f_path.dentry); + if (!(opened & FILE_OPENED)) put_filp(od.filp); - } if (res == ERR_PTR(-EOPENSTALE)) { if (flags & LOOKUP_RCU) res = ERR_PTR(-ECHILD);