diff -pruN 1.8.9-1/debian/changelog 1.8.9-1ubuntu1/debian/changelog --- 1.8.9-1/debian/changelog 2022-12-22 18:37:54.000000000 +0000 +++ 1.8.9-1ubuntu1/debian/changelog 2023-02-17 10:42:20.000000000 +0000 @@ -1,3 +1,9 @@ +openafs (1.8.9-1ubuntu1) lunar; urgency=medium + + * Linux 6.0+ FTBFS (LP: #2007263) + + -- Paolo Pisati Fri, 17 Feb 2023 10:42:20 +0000 + openafs (1.8.9-1) unstable; urgency=medium [ Benjamin Kaduk ] diff -pruN 1.8.9-1/debian/control 1.8.9-1ubuntu1/debian/control --- 1.8.9-1/debian/control 2022-12-22 18:27:46.000000000 +0000 +++ 1.8.9-1ubuntu1/debian/control 2023-02-17 10:42:20.000000000 +0000 @@ -1,7 +1,8 @@ Source: openafs Section: net Priority: optional -Maintainer: Benjamin Kaduk +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Benjamin Kaduk Uploaders: Sam Hartman , Anders Kaseorg Build-Depends: debhelper, debhelper-compat (= 12), autoconf, automake, bison, comerr-dev, cpio, flex, libfuse-dev, libkrb5-dev, libncurses5-dev, diff -pruN 1.8.9-1/debian/patches/0008-Linux-Replace-lru_cache_add-with-folio_add_lru.patch 1.8.9-1ubuntu1/debian/patches/0008-Linux-Replace-lru_cache_add-with-folio_add_lru.patch --- 1.8.9-1/debian/patches/0008-Linux-Replace-lru_cache_add-with-folio_add_lru.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.8.9-1ubuntu1/debian/patches/0008-Linux-Replace-lru_cache_add-with-folio_add_lru.patch 2023-02-17 10:42:20.000000000 +0000 @@ -0,0 +1,82 @@ +From cfac0df9cd7152be2672c665442aac84215494d6 Mon Sep 17 00:00:00 2001 +From: Cheyenne Wills +Date: Wed, 14 Dec 2022 13:40:48 -0700 +Subject: [PATCH] Linux: Replace lru_cache_add with folio_add_lru + +The Linux 6.2 commit: + "folio-compat: remove lru_cache_add()" (6e1ca48d0) +removed the lru_cache_add() function (which was introduced in Linux 5.8) + +The replacement function is folio_add_lru(), which was introduced with +the Linux 5.16 commit: + "mm/lru: Add folio_add_lru()" (0d31125d2d) + +Change-Id: I4615e6bde0253618c13ec1eb067e23b2c3e3ff42 +Reviewed-on: https://gerrit.openafs.org/15227 +Reviewed-by: Benjamin Kaduk +Tested-by: Benjamin Kaduk +--- + src/afs/LINUX/osi_vnodeops.c | 10 +++++++--- + src/cf/linux-kernel-func.m4 | 7 +++++++ + 2 files changed, 14 insertions(+), 3 deletions(-) + +diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c +index e9ac9e3a2..89e85e9c2 100644 +--- a/src/afs/LINUX/osi_vnodeops.c ++++ b/src/afs/LINUX/osi_vnodeops.c +@@ -32,7 +32,7 @@ + #endif + #include + #include +-#if defined(HAVE_LINUX_LRU_CACHE_ADD_FILE) ++#if defined(HAVE_LINUX_FOLIO_ADD_LRU) || defined(HAVE_LINUX_LRU_CACHE_ADD_FILE) + # include + #else + # include +@@ -78,7 +78,8 @@ extern struct vcache *afs_globalVp; + + /* Handle interfacing with Linux's pagevec/lru facilities */ + +-#if defined(HAVE_LINUX_LRU_CACHE_ADD_FILE) || defined(HAVE_LINUX_LRU_CACHE_ADD) ++#if defined(HAVE_LINUX_FOLIO_ADD_LRU) || \ ++ defined(HAVE_LINUX_LRU_CACHE_ADD_FILE) || defined(HAVE_LINUX_LRU_CACHE_ADD) + + /* + * Linux's lru_cache_add_file provides a simplified LRU interface without +@@ -97,7 +98,10 @@ afs_lru_cache_init(struct afs_lru_pages *alrupages) + static inline void + afs_lru_cache_add(struct afs_lru_pages *alrupages, struct page *page) + { +-# if defined(HAVE_LINUX_LRU_CACHE_ADD) ++# if defined(HAVE_LINUX_FOLIO_ADD_LRU) ++ struct folio *folio = page_folio(page); ++ folio_add_lru(folio); ++# elif defined(HAVE_LINUX_LRU_CACHE_ADD) + lru_cache_add(page); + # elif defined(HAVE_LINUX_LRU_CACHE_ADD_FILE) + lru_cache_add_file(page); +diff --git a/src/cf/linux-kernel-func.m4 b/src/cf/linux-kernel-func.m4 +index 504c73122..a53c186a8 100644 +--- a/src/cf/linux-kernel-func.m4 ++++ b/src/cf/linux-kernel-func.m4 +@@ -173,10 +173,17 @@ AC_CHECK_LINUX_FUNC([in_compat_syscall], + + dnl lru_cache_add exported in Linux 5.8 + dnl replaces lru_cache_add_file ++dnl removed in linux 6.1. folio_add_lru is a replacement + AC_CHECK_LINUX_FUNC([lru_cache_add], + [#include ], + [lru_cache_add(NULL);]) + ++dnl Linux 5.16 added folio_add_lru as a replacement for ++dnl lru_cache_add ++AC_CHECK_LINUX_FUNC([folio_add_lru], ++ [#include ], ++ [folio_add_lru(NULL);]) ++ + dnl Linux 5.8 replaced kernel_setsockopt with helper functions + dnl e.g. ip_sock_set_mtu_discover, ip_sock_set_recverr + AC_CHECK_LINUX_FUNC([ip_sock_set], +-- +2.38.1 + diff -pruN 1.8.9-1/debian/patches/series 1.8.9-1ubuntu1/debian/patches/series --- 1.8.9-1/debian/patches/series 2022-12-22 18:34:01.000000000 +0000 +++ 1.8.9-1ubuntu1/debian/patches/series 2023-02-17 10:42:20.000000000 +0000 @@ -2,3 +2,4 @@ 0005-tests-skip-vos-tests-when-a-vlserver-is-already-runn.patch 0007-Temporarily-disable-flaky-test.patch 0004-Disable-rx-perf-test.patch +0008-Linux-Replace-lru_cache_add-with-folio_add_lru.patch