From 2c25c99cb4572ffae97555a56b24a4c4097dcdec Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Wed, 10 May 2017 08:13:52 +0800 Subject: [PATCH] pybind: fix open flags calculation (O_WRONLY | O_RDWR) is invaild open flags Fixes: http://tracker.ceph.com/issues/19890 Signed-off-by: "Yan, Zheng" --- src/pybind/cephfs/cephfs.pyx | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/pybind/cephfs/cephfs.pyx b/src/pybind/cephfs/cephfs.pyx index 94df1b21a99..e7b4ec1e97e 100644 --- a/src/pybind/cephfs/cephfs.pyx +++ b/src/pybind/cephfs/cephfs.pyx @@ -659,16 +659,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) + + 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: -- 2.39.5