diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-06-10 06:48:09 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-07-14 08:33:45 -0400 |
commit | e45198a6ac24bd2c4ad4a43b670c2f1a23dd2df3 (patch) | |
tree | d44f4217a8a556ac9ebb11cfc41c0e148fb1084c /fs/9p | |
parent | 2675a4eb6a9f1240098721c8a84ede28abd9d7b3 (diff) |
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.c | 6 | ||||
-rw-r--r-- | fs/9p/vfs_inode_dotl.c | 6 |
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, | |||
878 | } | 878 | } |
879 | 879 | ||
880 | /* Only creates */ | 880 | /* Only creates */ |
881 | if (!(flags & O_CREAT) || dentry->d_inode) { | 881 | if (!(flags & O_CREAT) || dentry->d_inode) |
882 | finish_no_open(file, res); | 882 | return finish_no_open(file, res); |
883 | return 1; | ||
884 | } | ||
885 | 883 | ||
886 | err = 0; | 884 | err = 0; |
887 | fid = NULL; | 885 | 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, | |||
268 | } | 268 | } |
269 | 269 | ||
270 | /* Only creates */ | 270 | /* Only creates */ |
271 | if (!(flags & O_CREAT) || dentry->d_inode) { | 271 | if (!(flags & O_CREAT) || dentry->d_inode) |
272 | finish_no_open(file, res); | 272 | return finish_no_open(file, res); |
273 | return 1; | ||
274 | } | ||
275 | 273 | ||
276 | v9ses = v9fs_inode2v9ses(dir); | 274 | v9ses = v9fs_inode2v9ses(dir); |
277 | 275 | ||