diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-06-10 05:04:43 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-07-14 16:33:33 +0400 |
| commit | 3d8a00d2099ebc6d5a6e95fadaf861709d9919a8 (patch) | |
| tree | 317bfb9d71e3ef35746685c6da2397545917d81e /fs | |
| parent | 47237687d73cbeae1dd7a133c3fc3d7239094568 (diff) | |
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/namei.c | 4 | ||||
| -rw-r--r-- | fs/open.c | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/fs/namei.c b/fs/namei.c index 7a33f074e5b..18b9326d951 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2708,10 +2708,8 @@ out: 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); diff --git a/fs/open.c b/fs/open.c index 89589bd3993..c87f98201c2 100644 --- a/fs/open.c +++ b/fs/open.c @@ -786,15 +786,14 @@ struct file *finish_open(struct opendata *od, struct dentry *dentry, int *opened) { struct file *res; + BUG_ON(*opened & FILE_OPENED); /* once it's opened, it's opened */ mntget(od->mnt); dget(dentry); res = do_dentry_open(dentry, od->mnt, od->filp, open, current_cred()); - if (!IS_ERR(res)) { + if (!IS_ERR(res)) *opened |= FILE_OPENED; - od->filp = NULL; - } return res; } |