dm-vdo / vdo-devel

Primary VDO mainline development repository
GNU General Public License v2.0
5 stars 11 forks source link

[VDO 5784] dm vdo lib min_heap: Update min_heap for mainline-next build #146

Closed C2Redhat closed 3 months ago

C2Redhat commented 4 months ago

Merge three changes from author Kuan-Wei Chiu visitorckw@gmail.com:

lib min_heap: Rename min_heapify() to min_heap_sift_down() Link: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/drivers/md/dm-vdo?id=1a4ff1407a75d831131dfa3e8d2cad1910c26158 lib min_heap: Add args for min_heap_callbacks Link: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/drivers/md/dm-vdo?id=156c8066a998aba49dc7d0d5469caa28578586f5 lib min_heap: Add type safe interface Link: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/drivers/md/dm-vdo?id=a8d3930625b12baf8f5da5f6610493b0e4b2e898

These changes are needed to build vdo with the latest mainline-next.

We do not know when these changes will roll into RAWHIDE and RHEL. We will use LINUX_VERSION(6,10,0) and RHEL_RELEASE_VERSION(9,5) temporarily for comparison so we can compile mainline-next. Once those changes merge into mainline, we will need to update the comparison version.

github-actions[bot] commented 4 months ago

Unit Test Results

  10 files    92 suites   2h 18m 16s :stopwatch: 264 tests 264 :heavy_check_mark: 0 :zzz: 0 :x: 267 runs  267 :heavy_check_mark: 0 :zzz: 0 :x:

Results for commit 4c2b2497.

:recycle: This comment has been updated with latest results.

sweettea commented 3 months ago

You can find 6.9.1 on kernel.org or as a tag on the stable tree: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/

(which doesnt really matter for this, but just for the record)

On 2024-06-13 14:59, Matthew Sakai wrote:

@lorelei-sakai commented on this pull request.

In src/c++/vdo/base/repair.c [1]:

@@ -24,6 +27,19 @@

include "vdo.h"

include "wait-queue.h"

+#ifndef VDO_UPSTREAM +#undef VDO_USE_ALTERNATE +#if defined(RHEL_RELEASE_CODE) && defined(RHEL_MINOR) && (RHEL_MINOR < 50) +#if (RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(10, 0)) +#define VDO_USE_ALTERNATE +#endif +#else / !RHEL_RELEASE_CODE / +#if (LINUX_VERSION_CODE > KERNEL_VERSION(6, 9, 0)) +#define VDO_USE_ALTERNATE

Like I said, I don't know where we would find, say, a 6.9.1 kernel version to test with. But elixir claims it exists and it won't build with the newer code.

-- Reply to this email directly, view it on GitHub [1], or unsubscribe [2]. You are receiving this because you are subscribed to this thread.Message ID: @.***>

Links:

[1] https://github.com/dm-vdo/vdo-devel/pull/146#discussion_r1638747098 [2] https://github.com/notifications/unsubscribe-auth/AAJQ5BMS6UB7QLPIG73MOO3ZHHTYTAVCNFSM6AAAAABHNZOB3SVHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHMZDCMJWGY4TCNJYGA