->atomic_open() prototype change - pass int * instead of bool *

... and let finish_open() report having opened the file via that sucker.
Next step: don't modify od->filp at all.

[AV: FILE_CREATE was already used by cifs; Miklos' fix folded]

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2012-06-10 05:01:45 -04:00
parent a8277b9baa
commit 47237687d7
14 changed files with 63 additions and 52 deletions

View File

@@ -782,7 +782,8 @@ static struct file *__dentry_open(struct dentry *dentry, struct vfsmount *mnt,
* filesystem callback is substituted.
*/
struct file *finish_open(struct opendata *od, struct dentry *dentry,
int (*open)(struct inode *, struct file *))
int (*open)(struct inode *, struct file *),
int *opened)
{
struct file *res;
@@ -790,8 +791,10 @@ struct file *finish_open(struct opendata *od, struct dentry *dentry,
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;
}