This repository has been archived by the owner on Sep 2, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathb64776874c07732720b716b81b8dc9c14115da12.patch
118 lines (104 loc) · 6.88 KB
/
b64776874c07732720b716b81b8dc9c14115da12.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
From b64776874c07732720b716b81b8dc9c14115da12 Mon Sep 17 00:00:00 2001
From: Mohamad Chaarawi <[email protected]>
Date: Thu, 1 Dec 2022 10:37:20 -0600
Subject: [PATCH] fix daos object open flags to properly set RW/RO permissions.
(#38)
Signed-off-by: Mohamad Chaarawi <[email protected]>
Signed-off-by: Mohamad Chaarawi <[email protected]>
---
src/daos_vol_dset.c | 4 ++--
src/daos_vol_file.c | 2 +-
src/daos_vol_group.c | 4 ++--
src/daos_vol_map.c | 4 ++--
src/daos_vol_type.c | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/daos_vol_dset.c b/src/daos_vol_dset.c
index a16750f..ea67cd6 100644
--- a/src/daos_vol_dset.c
+++ b/src/daos_vol_dset.c
@@ -1425,7 +1425,7 @@ H5_daos_dset_open_recv_comp_cb(tse_task_t *task, void H5VL_DAOS_UNUSED *args)
/* Open dataset */
if (0 != (ret = daos_obj_open(
udata->bcast_udata.obj->item.file->coh, udata->bcast_udata.obj->oid,
- udata->bcast_udata.obj->item.file->flags & H5F_ACC_RDWR ? DAOS_COO_RW : DAOS_COO_RO,
+ udata->bcast_udata.obj->item.file->flags & H5F_ACC_RDWR ? DAOS_OO_RW : DAOS_OO_RO,
&udata->bcast_udata.obj->obj_oh, NULL /*event*/)))
D_GOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, ret, "can't open dataset: %s",
H5_daos_err_to_string(ret));
@@ -1995,7 +1995,7 @@ H5_daos_dataset_open_helper(H5_daos_file_t *file, hid_t dapl_id, hbool_t collect
/* Open dataset object */
if (H5_daos_obj_open(file, req, &dset->obj.oid,
- (file->flags & H5F_ACC_RDWR ? DAOS_COO_RW : DAOS_COO_RO), &dset->obj.obj_oh,
+ (file->flags & H5F_ACC_RDWR ? DAOS_OO_RW : DAOS_OO_RO), &dset->obj.obj_oh,
"dataset object open", first_task, dep_task) < 0)
D_GOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, NULL, "can't open dataset object");
diff --git a/src/daos_vol_file.c b/src/daos_vol_file.c
index ed9c839..5599596 100644
--- a/src/daos_vol_file.c
+++ b/src/daos_vol_file.c
@@ -1660,7 +1660,7 @@ H5_daos_file_open(const char *name, unsigned flags, hid_t fapl_id, hid_t H5VL_DA
D_GOTO_ERROR(H5E_FILE, H5E_CANTENCODE, NULL, "can't encode global metadata object ID");
/* Open global metadata object */
- if (H5_daos_obj_open(file, int_req, &file->glob_md_oid, flags & H5F_ACC_RDWR ? DAOS_COO_RW : DAOS_COO_RO,
+ if (H5_daos_obj_open(file, int_req, &file->glob_md_oid, flags & H5F_ACC_RDWR ? DAOS_OO_RW : DAOS_OO_RO,
&file->glob_md_oh, "global metadata object open", &first_task, &dep_task) < 0)
D_GOTO_ERROR(H5E_FILE, H5E_CANTOPENOBJ, NULL, "can't open global metadata object");
diff --git a/src/daos_vol_group.c b/src/daos_vol_group.c
index 10ec148..f39286e 100644
--- a/src/daos_vol_group.c
+++ b/src/daos_vol_group.c
@@ -961,7 +961,7 @@ H5_daos_group_open_recv_comp_cb(tse_task_t *task, void H5VL_DAOS_UNUSED *args)
/* Open group */
if (0 != (ret = daos_obj_open(
udata->bcast_udata.obj->item.file->coh, udata->bcast_udata.obj->oid,
- udata->bcast_udata.obj->item.file->flags & H5F_ACC_RDWR ? DAOS_COO_RW : DAOS_COO_RO,
+ udata->bcast_udata.obj->item.file->flags & H5F_ACC_RDWR ? DAOS_OO_RW : DAOS_OO_RO,
&udata->bcast_udata.obj->obj_oh, NULL /*event*/)))
D_GOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, ret, "can't open group: %s",
H5_daos_err_to_string(ret));
@@ -1265,7 +1265,7 @@ H5_daos_group_open_helper(H5_daos_file_t *file, H5_daos_group_t *grp, hid_t gapl
tse_task_t *fetch_task = NULL;
/* Open group object */
- if (H5_daos_obj_open(file, req, &grp->obj.oid, file->flags & H5F_ACC_RDWR ? DAOS_COO_RW : DAOS_COO_RO,
+ if (H5_daos_obj_open(file, req, &grp->obj.oid, file->flags & H5F_ACC_RDWR ? DAOS_OO_RW : DAOS_OO_RO,
&grp->obj.obj_oh, "group object open", first_task, dep_task) < 0)
D_GOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, -H5_DAOS_H5_OPEN_ERROR, "can't open group object");
diff --git a/src/daos_vol_map.c b/src/daos_vol_map.c
index ef2c26e..7dfee8f 100644
--- a/src/daos_vol_map.c
+++ b/src/daos_vol_map.c
@@ -767,7 +767,7 @@ H5_daos_map_open_helper(H5_daos_file_t *file, hid_t mapl_id, hbool_t collective,
/* Open map object */
if (H5_daos_obj_open(file, req, &map->obj.oid,
- (file->flags & H5F_ACC_RDWR ? DAOS_COO_RW : DAOS_COO_RO), &map->obj.obj_oh,
+ (file->flags & H5F_ACC_RDWR ? DAOS_OO_RW : DAOS_OO_RO), &map->obj.obj_oh,
"map object open", first_task, dep_task) < 0)
D_GOTO_ERROR(H5E_MAP, H5E_CANTOPENOBJ, NULL, "can't open map object");
@@ -1246,7 +1246,7 @@ H5_daos_map_open_recv_comp_cb(tse_task_t *task, void H5VL_DAOS_UNUSED *args)
if (0 !=
(ret = daos_obj_open(
udata->bcast_udata.obj->item.file->coh, udata->bcast_udata.obj->oid,
- (udata->bcast_udata.obj->item.file->flags & H5F_ACC_RDWR ? DAOS_COO_RW : DAOS_COO_RO),
+ (udata->bcast_udata.obj->item.file->flags & H5F_ACC_RDWR ? DAOS_OO_RW : DAOS_OO_RO),
&udata->bcast_udata.obj->obj_oh, NULL /*event*/)))
D_GOTO_ERROR(H5E_MAP, H5E_CANTOPENOBJ, ret, "can't open map: %s", H5_daos_err_to_string(ret));
diff --git a/src/daos_vol_type.c b/src/daos_vol_type.c
index b0ce59f..79e6dc0 100644
--- a/src/daos_vol_type.c
+++ b/src/daos_vol_type.c
@@ -1191,7 +1191,7 @@ H5_daos_datatype_open_helper(H5_daos_file_t *file, hid_t tapl_id, hbool_t collec
/* Open datatype object */
if (H5_daos_obj_open(file, req, &dtype->obj.oid,
- (file->flags & H5F_ACC_RDWR ? DAOS_COO_RW : DAOS_COO_RO), &dtype->obj.obj_oh,
+ (file->flags & H5F_ACC_RDWR ? DAOS_OO_RW : DAOS_OO_RO), &dtype->obj.obj_oh,
"datatype object open", first_task, dep_task) < 0)
D_GOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, NULL, "can't open datatype object");
@@ -1522,7 +1522,7 @@ H5_daos_datatype_open_recv_comp_cb(tse_task_t *task, void H5VL_DAOS_UNUSED *args
if (0 !=
(ret = daos_obj_open(
udata->bcast_udata.obj->item.file->coh, udata->bcast_udata.obj->oid,
- (udata->bcast_udata.obj->item.file->flags & H5F_ACC_RDWR ? DAOS_COO_RW : DAOS_COO_RO),
+ (udata->bcast_udata.obj->item.file->flags & H5F_ACC_RDWR ? DAOS_OO_RW : DAOS_OO_RO),
&udata->bcast_udata.obj->obj_oh, NULL /*event*/)))
D_GOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, ret, "can't open datatype: %s",
H5_daos_err_to_string(ret));