Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
iSulad
提交
d151ea05
I
iSulad
项目概览
openeuler
/
iSulad
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
iSulad
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d151ea05
编写于
5月 06, 2020
作者:
L
LiFeng
提交者:
lifeng68
7月 25, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
driver: make NULL as valid parent ID
Signed-off-by:
N
LiFeng
<
lifeng68@huawei.com
>
上级
6ce5ee4c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
13 addition
and
13 deletion
+13
-13
src/image/oci/storage/layer_store/graphdriver/devmapper/driver_devmapper.c
...rage/layer_store/graphdriver/devmapper/driver_devmapper.c
+2
-2
src/image/oci/storage/layer_store/graphdriver/driver.c
src/image/oci/storage/layer_store/graphdriver/driver.c
+3
-3
src/image/oci/storage/layer_store/graphdriver/overlay2/driver_overlay2.c
...torage/layer_store/graphdriver/overlay2/driver_overlay2.c
+6
-6
src/image/oci/storage/storage.c
src/image/oci/storage/storage.c
+2
-2
未找到文件。
src/image/oci/storage/layer_store/graphdriver/devmapper/driver_devmapper.c
浏览文件 @
d151ea05
...
...
@@ -48,7 +48,7 @@ static int do_create(const char *id, const char *parent, const struct driver_cre
int
devmapper_create_rw
(
const
char
*
id
,
const
char
*
parent
,
const
struct
graphdriver
*
driver
,
const
struct
driver_create_opts
*
create_opts
)
{
if
(
id
==
NULL
||
parent
==
NULL
||
driver
==
NULL
||
create_opts
==
NULL
)
{
if
(
id
==
NULL
||
driver
==
NULL
||
create_opts
==
NULL
)
{
return
-
1
;
}
...
...
@@ -59,7 +59,7 @@ int devmapper_create_rw(const char *id, const char *parent, const struct graphdr
int
devmapper_create_ro
(
const
char
*
id
,
const
char
*
parent
,
const
struct
graphdriver
*
driver
,
const
struct
driver_create_opts
*
create_opts
)
{
if
(
id
==
NULL
||
parent
==
NULL
||
driver
==
NULL
||
create_opts
==
NULL
)
{
if
(
id
==
NULL
||
driver
==
NULL
||
create_opts
==
NULL
)
{
return
-
1
;
}
...
...
src/image/oci/storage/layer_store/graphdriver/driver.c
浏览文件 @
d151ea05
...
...
@@ -110,7 +110,7 @@ int graphdriver_create_rw(const char *id, const char *parent, struct driver_crea
return
-
1
;
}
if
(
id
==
NULL
||
parent
==
NULL
||
create_opts
==
NULL
)
{
if
(
id
==
NULL
||
create_opts
==
NULL
)
{
ERROR
(
"Invalid input arguments for driver create"
);
return
-
1
;
}
...
...
@@ -125,7 +125,7 @@ int graphdriver_create_ro(const char *id, const char *parent, const struct drive
return
-
1
;
}
if
(
id
==
NULL
||
parent
==
NULL
||
create_opts
==
NULL
)
{
if
(
id
==
NULL
||
create_opts
==
NULL
)
{
ERROR
(
"Invalid input arguments for driver create"
);
return
-
1
;
}
...
...
@@ -296,7 +296,7 @@ int graphdriver_try_repair_lowers(const char *id, const char *parent)
return
-
1
;
}
if
(
id
==
NULL
||
parent
==
NULL
)
{
if
(
id
==
NULL
)
{
ERROR
(
"Invalid input arguments for driver repair lower"
);
return
-
1
;
}
...
...
src/image/oci/storage/layer_store/graphdriver/overlay2/driver_overlay2.c
浏览文件 @
d151ea05
...
...
@@ -339,7 +339,7 @@ static int check_parent_valid(const char *parent, const struct graphdriver *driv
int
ret
=
0
;
char
*
parent_dir
=
NULL
;
if
(
strcmp
(
parent
,
""
)
!=
0
)
{
if
(
parent
!=
NULL
)
{
parent_dir
=
util_path_join
(
driver
->
home
,
parent
);
if
(
parent_dir
==
NULL
)
{
ERROR
(
"Failed to join layer dir:%s"
,
parent
);
...
...
@@ -677,7 +677,7 @@ static int mk_sub_directorys(const char *id, const char *parent, const char *lay
goto
out
;
}
if
(
strcmp
(
parent
,
""
)
==
0
)
{
if
(
parent
==
NULL
)
{
if
(
mk_empty_directory
(
layer_dir
)
!=
0
)
{
ret
=
-
1
;
goto
out
;
...
...
@@ -822,7 +822,7 @@ int overlay2_create_rw(const char *id, const char *parent, const struct graphdri
{
int
ret
=
0
;
if
(
id
==
NULL
||
parent
==
NULL
||
driver
==
NULL
||
create_opts
==
NULL
)
{
if
(
id
==
NULL
||
driver
==
NULL
||
create_opts
==
NULL
)
{
return
-
1
;
}
...
...
@@ -848,7 +848,7 @@ int overlay2_create_ro(const char *id, const char *parent, const struct graphdri
{
int
ret
=
0
;
if
(
id
==
NULL
||
parent
==
NULL
||
driver
==
NULL
||
create_opts
==
NULL
)
{
if
(
id
==
NULL
||
driver
==
NULL
||
create_opts
==
NULL
)
{
return
-
1
;
}
...
...
@@ -1783,7 +1783,7 @@ int overlay2_repair_lowers(const char *id, const char *parent, const struct grap
char
**
lowers_arr
=
NULL
;
size_t
lowers_size
=
0
;
if
(
id
==
NULL
||
driver
==
NULL
||
parent
==
NULL
)
{
if
(
id
==
NULL
||
driver
==
NULL
)
{
return
-
1
;
}
...
...
@@ -1810,7 +1810,7 @@ int overlay2_repair_lowers(const char *id, const char *parent, const struct grap
}
}
if
(
strcmp
(
parent
,
""
)
==
0
)
{
if
(
parent
==
NULL
)
{
if
(
mk_empty_directory
(
layer_dir
)
!=
0
)
{
ret
=
-
1
;
goto
out
;
...
...
src/image/oci/storage/storage.c
浏览文件 @
d151ea05
...
...
@@ -96,7 +96,7 @@ int storage_layer_create(const char *layer_id, const char *parent_id, bool write
struct
io_read_wrapper
reader
=
{
0
};
struct
layer_opts
*
opts
=
NULL
;
if
(
layer_id
==
NULL
||
parent_id
==
NULL
||
layer_data_path
==
NULL
)
{
if
(
layer_id
==
NULL
||
layer_data_path
==
NULL
)
{
ERROR
(
"Invalid arguments for put ro layer"
);
ret
=
-
1
;
goto
out
;
...
...
@@ -197,7 +197,7 @@ int storage_img_create(const char *id, const char *parent_id, const char *metada
int
ret
=
0
;
char
*
image_id
=
NULL
;
if
(
id
==
NULL
||
parent_id
==
NULL
||
metadata
==
NULL
||
opts
==
NULL
)
{
if
(
id
==
NULL
||
metadata
==
NULL
||
opts
==
NULL
)
{
ERROR
(
"Invalid arguments for image create"
);
ret
=
-
1
;
goto
out
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录