From 2acbd59c418248bdbb237f7851ec90ae7313abee Mon Sep 17 00:00:00 2001 From: Qiuwen Lu Date: Thu, 29 Dec 2016 13:57:27 +0800 Subject: 修正RPM打包名字的生成问题，自动生成符合RPM标准的包名称。 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake/Package.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/Package.cmake b/cmake/Package.cmake index 0c2684b..9343ff9 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -8,6 +8,8 @@ set(CPACK_STRIP_FILES TRUE) # RPM Build set(CPACK_GENERATOR "RPM") +set(CPACK_RPM_AUTO_GENERATED_FILE_NAME ON) +set(CPACK_RPM_FILE_NAME "RPM-DEFAULT") set(CPACK_RPM_PACKAGE_VENDOR "Mesasoft@IIE") set(CPACK_RPM_PACKAGE_AUTOREQPROV "no") set(CPACK_RPM_PACKAGE_REQUIRES "/boot/vmlinuz-${MARSIO_VERSION_KERNEL}") -- cgit v1.2.3 From 1918468b05d90ebd25085cd4b2ceaef5579552d0 Mon Sep 17 00:00:00 2001 From: Qiuwen Lu Date: Thu, 5 Jan 2017 10:39:06 +0800 Subject: 修正VNODE中消费者删除时计算消费者引用的BlockList和生产者引用的BlockList交集时的错误。该错误导致消费者删除时，会清空生产者引用的所有BlockList。 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/vnode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/vnode.c b/core/src/vnode.c index 0ec211d..c4a70fd 100644 --- a/core/src/vnode.c +++ b/core/src/vnode.c @@ -788,7 +788,7 @@ int vnode_delete_cons(struct vnode_cons * cons, struct vnode_ops * ops) unsigned int tag_prod_block_list[RTE_DIM(prod_iter->block_list)] = { 0 }; block_list_intersection(prod_iter->block_list, RTE_DIM(prod_iter->block_list), - tag_cons_block_list, cons->block_list, RTE_DIM(cons->block_list), tag_prod_block_list); + tag_prod_block_list, cons->block_list, RTE_DIM(cons->block_list), tag_cons_block_list); for(int i = 0; i < RTE_DIM(tag_prod_block_list); i++) { -- cgit v1.2.3