summaryrefslogtreecommitdiffstats
path: root/fs/9p
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-06-10 06:48:09 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2012-07-14 16:33:45 +0400
commite45198a6ac24bd2c4ad4a43b670c2f1a23dd2df3 (patch)
treed44f4217a8a556ac9ebb11cfc41c0e148fb1084c /fs/9p
parent2675a4eb6a9f1240098721c8a84ede28abd9d7b3 (diff)
downloadblackbird-op-linux-e45198a6ac24bd2c4ad4a43b670c2f1a23dd2df3.tar.gz
blackbird-op-linux-e45198a6ac24bd2c4ad4a43b670c2f1a23dd2df3.zip
make finish_no_open() return int
namely, 1 ;-) That's what we want to return from ->atomic_open() instances after finish_no_open(). Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/9p')
-rw-r--r--fs/9p/vfs_inode.c6
-rw-r--r--fs/9p/vfs_inode_dotl.c6
2 files changed, 4 insertions, 8 deletions
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index 2b05651e0c3d..eae476fb401c 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -878,10 +878,8 @@ v9fs_vfs_atomic_open(struct inode *dir, struct dentry *dentry,
}
/* Only creates */
- if (!(flags & O_CREAT) || dentry->d_inode) {
- finish_no_open(file, res);
- return 1;
- }
+ if (!(flags & O_CREAT) || dentry->d_inode)
+ return finish_no_open(file, res);
err = 0;
fid = NULL;
diff --git a/fs/9p/vfs_inode_dotl.c b/fs/9p/vfs_inode_dotl.c
index cfaebdef9743..1ee10c89df97 100644
--- a/fs/9p/vfs_inode_dotl.c
+++ b/fs/9p/vfs_inode_dotl.c
@@ -268,10 +268,8 @@ v9fs_vfs_atomic_open_dotl(struct inode *dir, struct dentry *dentry,
}
/* Only creates */
- if (!(flags & O_CREAT) || dentry->d_inode) {
- finish_no_open(file, res);
- return 1;
- }
+ if (!(flags & O_CREAT) || dentry->d_inode)
+ return finish_no_open(file, res);
v9ses = v9fs_inode2v9ses(dir);
OpenPOWER on IntegriCloud