d4bcbf7d60
- Fix 32Bit build by adding commit 554176bd236d772d670df9bdd2496facd5a4209a as use_timespec64_for_kernel_4.18.patch - Update to 1.8.1 OBS-URL: https://build.opensuse.org/request/show/630053 OBS-URL: https://build.opensuse.org/package/show/filesystems/openafs?expand=0&rev=21
58 lines
2.2 KiB
Diff
58 lines
2.2 KiB
Diff
--- openafs-1.8.1/./src/afs/LINUX/osi_file.c.orig 2018-08-16 14:41:44.505768721 +0200
|
|
+++ openafs-1.8.1/./src/afs/LINUX/osi_file.c 2018-08-16 14:42:27.422432188 +0200
|
|
@@ -23,7 +23,11 @@
|
|
#include "osi_compat.h"
|
|
|
|
#ifndef CURRENT_TIME
|
|
-#define CURRENT_TIME (current_kernel_time())
|
|
+# ifdef IATTR_TAKES_64BIT_TIME
|
|
+# define CURRENT_TIME (current_kernel_time64())
|
|
+# else
|
|
+# define CURRENT_TIME (current_kernel_time())
|
|
+# endif
|
|
#endif
|
|
|
|
int cache_fh_type = -1;
|
|
--- openafs-1.8.1/src/config/afsconfig.h.in.orig 2018-08-16 15:04:41.102698738 +0200
|
|
+++ openafs-1.8.1/src/config/afsconfig.h.in 2018-08-16 15:05:21.079300996 +0200
|
|
@@ -1023,6 +1023,9 @@
|
|
/* define if hlist iterators don't need a node parameter */
|
|
#undef HLIST_ITERATOR_NO_NODE
|
|
|
|
+/* define if struct iattr->ia_ctime takes struct timespec64 */
|
|
+#undef IATTR_TAKES_64BIT_TIME
|
|
+
|
|
/* define to disable some gcc warnings in warnings-as-errors mode */
|
|
#undef IGNORE_SOME_GCC_WARNINGS
|
|
|
|
--- openafs-1.8.1/src/cf/linux-test4.m4.orig 2018-07-28 23:17:32.000000000 +0200
|
|
+++ openafs-1.8.1/src/cf/linux-test4.m4 2018-08-16 15:08:39.378287300 +0200
|
|
@@ -183,6 +183,17 @@
|
|
[])
|
|
])
|
|
|
|
+AC_DEFUN([LINUX_IATTR_64BIT_TIME], [
|
|
+ AC_CHECK_LINUX_BUILD([whether struct iattr->ia_ctime takes struct timespec64 or 32-bit struct timespec],
|
|
+ [ac_cv_linux_func_iattr_ctime_takes_timespec64],
|
|
+ [#include <linux/fs.h>
|
|
+ #include <linux/timekeeping.h>],
|
|
+ [struct iattr _attrs;
|
|
+ _attrs.ia_ctime = current_kernel_time64();],
|
|
+ [IATTR_TAKES_64BIT_TIME],
|
|
+ [define if struct iattr->ia_ctime takes struct timespec64],
|
|
+ [])
|
|
+])
|
|
|
|
|
|
AC_DEFUN([LINUX_AOP_WRITEBACK_CONTROL], [
|
|
--- openafs-1.8.1/src/cf/linux-kernel-assorted.m4.orig 2018-08-16 15:24:18.672533975 +0200
|
|
+++ openafs-1.8.1/src/cf/linux-kernel-assorted.m4 2018-08-16 15:25:08.005280795 +0200
|
|
@@ -9,6 +9,7 @@
|
|
LINUX_D_PATH_TAKES_STRUCT_PATH
|
|
LINUX_NEW_EXPORT_OPS
|
|
LINUX_INODE_SETATTR_RETURN_TYPE
|
|
+LINUX_IATTR_64BIT_TIME
|
|
LINUX_IOP_I_CREATE_TAKES_NAMEIDATA
|
|
LINUX_IOP_I_LOOKUP_TAKES_NAMEIDATA
|
|
LINUX_IOP_I_PERMISSION_TAKES_FLAGS
|