Commit f656a211 authored by Bernd Lietzow's avatar Bernd Lietzow 🐨

Merge branch 'kernel-4.15-and-4.18-v6' into 'v6'

Kernel 4.15 and 4.18 v6

See merge request beegfs/projects0!879
parents b1aeb22b 6b0a41dd
......@@ -121,6 +121,8 @@ done <<END_OF_KERNEL_GCC_LIST
4.14 6
4.14.13 6
4.17.13 6
4.15.1 6
4.18.1 6
END_OF_KERNEL_GCC_LIST
while read ofed kernel ignore_
......
......@@ -478,6 +478,14 @@ client kernel=4,17,13 gcc=6:
image: "bumblebee:5000/kernel/x86_64/gcc6:linux-4.17.13"
variables: {BEEGFS_CI_KERNEL_DIR: "/kernel/linux-4.17.13"}
<<: *client-kernel-generic
client kernel=4,15,1 gcc=6:
image: "bumblebee:5000/kernel/x86_64/gcc6:linux-4.15.1"
variables: {BEEGFS_CI_KERNEL_DIR: "/kernel/linux-4.15.1"}
<<: *client-kernel-generic
client kernel=4,18,1 gcc=6:
image: "bumblebee:5000/kernel/x86_64/gcc6:linux-4.18.1"
variables: {BEEGFS_CI_KERNEL_DIR: "/kernel/linux-4.18.1"}
<<: *client-kernel-generic
client kernel=3,10,0-514,10,2,el7,x86_64 ofed=centos73_mlnx3,4-2,0,0,0:
image: "bumblebee:5000/kernel/x86_64/ofed:centos73_mlnx3.4-2.0.0.0"
variables: {BEEGFS_CI_KERNEL_DIR: "/usr/src/kernels/3.10.0-514.10.2.el7.x86_64"}
......
......@@ -370,6 +370,7 @@ $(call define_if_matches, KERNEL_HAS_ALLOC_WORKQUEUE, "alloc_workqueue", workque
$(call define_if_matches, KERNEL_HAS_WQ_RESCUER, "WQ_RESCUER", workqueue.h)
$(call define_if_matches, KERNEL_HAS_WAIT_QUEUE_ENTRY_T, "wait_queue_entry_t", wait.h)
$(call define_if_matches, KERNEL_HAS_CURRENT_FS_TIME, "current_fs_time", fs.h)
$(call define_if_matches, KERNEL_HAS_64BIT_TIMESTAMPS, "struct timespec64[[:space:]]\+i_atime;", fs.h)
# inodeChangeRes was changed to setattr_prepare in vanilla 4.9
$(call define_if_matches, KERNEL_HAS_SETATTR_PREPARE, "int setattr_prepare", fs.h)
......
......@@ -162,7 +162,13 @@
typedef wait_queue_entry_t wait_queue_t;
#endif
#if !defined(KERNEL_HAS_CURRENT_FS_TIME)
#if defined(KERNEL_HAS_64BIT_TIMESTAMPS)
static inline struct timespec64 current_fs_time(struct super_block *sb)
{
struct timespec64 now = current_kernel_time64();
return timespec64_trunc(now, sb->s_time_gran);
}
#elif !defined(KERNEL_HAS_CURRENT_FS_TIME)
static inline struct timespec current_fs_time(struct super_block *sb)
{
struct timespec now = current_kernel_time();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment