diff options
| author | Archzfs Buildbot | 2018-12-31 03:19:56 +0000 |
|---|---|---|
| committer | Archzfs Buildbot | 2018-12-31 03:19:56 +0000 |
| commit | fef7387260b33e1a4691273121a8bbee95de8172 (patch) | |
| tree | 16b9daf0f61678c088c6d1ee52fa0a09c03d527f /upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch | |
| parent | 849d51e991f9f077f9e58cfcafb5ced7a19837cd (diff) | |
| download | aur-fef7387260b33e1a4691273121a8bbee95de8172.tar.gz | |
Semi-automated update for kernel 4.20.0.zen1-1 + zfs 0.7.12
Diffstat (limited to 'upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch')
| -rw-r--r-- | upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch b/upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch new file mode 100644 index 000000000000..e36752293987 --- /dev/null +++ b/upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch @@ -0,0 +1,19 @@ +diff --git a/include/zpios-ctl.h b/include/zpios-ctl.h +index f17f1153260..068c9eaf173 100644 +--- a/include/zpios-ctl.h ++++ b/include/zpios-ctl.h +@@ -181,9 +181,12 @@ zpios_timespec_t + zpios_timespec_now(void) + { + zpios_timespec_t zts_now; +- struct timespec ts_now; ++ #if defined(HAVE_INODE_TIMESPEC64_TIMES) ++ inode_timespec_t ts_now = current_kernel_time64(); ++ #else ++ inode_timespec_t ts_now = current_kernel_time(); ++ #endif + +- ts_now = current_kernel_time(); + zts_now.ts_sec = ts_now.tv_sec; + zts_now.ts_nsec = ts_now.tv_nsec; + |