diff options
| author | Qiuwen Lu <[email protected]> | 2017-01-05 10:40:17 +0800 |
|---|---|---|
| committer | Qiuwen Lu <[email protected]> | 2017-01-05 10:40:17 +0800 |
| commit | c6d40cd3caafd556c6bbdc5e5218557a231005df (patch) | |
| tree | c88fb4aa8f429997e8a7a1a8cd1f90fad161d793 | |
| parent | 753e4a26348085914b8ce1ed8df00ba9e27ebc9a (diff) | |
| parent | 1918468b05d90ebd25085cd4b2ceaef5579552d0 (diff) | |
Merge branch 'dev-4.0' into rel-4.0v4.0.14-20170105rel-4.0
| -rw-r--r-- | cmake/Package.cmake | 2 | ||||
| -rw-r--r-- | core/src/vnode.c | 2 |
2 files changed, 3 insertions, 1 deletions
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}") 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++) { |