summaryrefslogtreecommitdiffstats
path: root/fs/ceph
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/ceph
parent2675a4eb6a9f1240098721c8a84ede28abd9d7b3 (diff)
downloadtalos-obmc-linux-e45198a6ac24bd2c4ad4a43b670c2f1a23dd2df3.tar.gz
talos-obmc-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/ceph')
-rw-r--r--fs/ceph/dir.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
index 80c848e05390..d42eee1c5de3 100644
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
@@ -662,10 +662,8 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry,
}
/* We don't deal with positive dentries here */
- if (dentry->d_inode) {
- finish_no_open(file, res);
- return 1;
- }
+ if (dentry->d_inode)
+ return finish_no_open(file, res);
*opened |= FILE_CREATED;
err = ceph_lookup_open(dir, dentry, file, flags, mode, opened);
OpenPOWER on IntegriCloud