RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 17:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15018 from ukernel/wip-19890

Browse Source 
pybind: fix open flags calculation

Reviewed-by: John Spray <john.spray@redhat.com>
This commit is contained in:
John Spray 2017-05-16 10:15:03 +01:00 committed by GitHub
commit 5efad43ec8
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/pybind/cephfs/cephfs.pyx
View File

@ -356,7 +356,8 @@ cdef class LibCephFS(object):
self.state = "uninitialized"
if rados_inst is not None:
if auth_id is not None or conffile is not None or conf is not None:
raise InvalidValue("May not pass RADOS instance as well as other configuration")
raise make_ex(errno.EINVAL,
"May not pass RADOS instance as well as other configuration")
self.create_with_rados(rados_inst)
else:
@ -659,16 +660,26 @@ cdef class LibCephFS(object):
if flags == '':
cephfs_flags = os.O_RDONLY
else:
access_flags = 0;
for c in flags:
if c == 'r':
cephfs_flags |= os.O_RDONLY
access_flags = 1;
elif c == 'w':
cephfs_flags |= os.O_WRONLY | os.O_TRUNC | os.O_CREAT
elif c == '+':
cephfs_flags |= os.O_RDWR
access_flags = 2;
cephfs_flags |= os.O_TRUNC | os.O_CREAT
elif access_flags > 0 and c == '+':
access_flags = 3;
else:
raise OperationNotSupported(
"open flags doesn't support %s" % c)
raise make_ex(errno.EOPNOTSUPP,
"open flags doesn't support %s" % c)
if access_flags == 1:
cephfs_flags |= os.O_RDONLY;
elif access_flags == 2:
cephfs_flags |= os.O_WRONLY;
else:
cephfs_flags |= os.O_RDWR;
elif isinstance(flags, int):
cephfs_flags = flags
else: