summaryrefslogtreecommitdiffstats
path: root/fs/fuse/dir.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-06-10 05:01:45 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-07-14 16:33:31 +0400
commit47237687d73cbeae1dd7a133c3fc3d7239094568 (patch)
tree1d267d03246f0a16cbff3c8221ee69dd1521f835 /fs/fuse/dir.c
parenta8277b9baa6268de386529a33061775bc716198b (diff)
downloadop-kernel-dev-47237687d73cbeae1dd7a133c3fc3d7239094568.zip
op-kernel-dev-47237687d73cbeae1dd7a133c3fc3d7239094568.tar.gz
->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>
Diffstat (limited to 'fs/fuse/dir.c')
-rw-r--r--fs/fuse/dir.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index e42442f..345f78e 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -371,7 +371,7 @@ static struct dentry *fuse_lookup(struct inode *dir, struct dentry *entry,
*/
static struct file *fuse_create_open(struct inode *dir, struct dentry *entry,
struct opendata *od, unsigned flags,
- umode_t mode)
+ umode_t mode, int *opened)
{
int err;
struct inode *inode;
@@ -450,7 +450,7 @@ static struct file *fuse_create_open(struct inode *dir, struct dentry *entry,
d_instantiate(entry, inode);
fuse_change_entry_timeout(entry, &outentry);
fuse_invalidate_attr(dir);
- file = finish_open(od, entry, generic_file_open);
+ file = finish_open(od, entry, generic_file_open, opened);
if (IS_ERR(file)) {
fuse_sync_release(ff, flags);
} else {
@@ -472,7 +472,7 @@ out_err:
static int fuse_mknod(struct inode *, struct dentry *, umode_t, dev_t);
static struct file *fuse_atomic_open(struct inode *dir, struct dentry *entry,
struct opendata *od, unsigned flags,
- umode_t mode, bool *created)
+ umode_t mode, int *opened)
{
int err;
struct fuse_conn *fc = get_fuse_conn(dir);
@@ -492,12 +492,12 @@ static struct file *fuse_atomic_open(struct inode *dir, struct dentry *entry,
goto no_open;
/* Only creates */
- *created = true;
+ *opened |= FILE_CREATED;
if (fc->no_create)
goto mknod;
- file = fuse_create_open(dir, entry, od, flags, mode);
+ file = fuse_create_open(dir, entry, od, flags, mode, opened);
if (PTR_ERR(file) == -ENOSYS) {
fc->no_create = 1;
goto mknod;
OpenPOWER on IntegriCloud