From 53b019accfdb3d80b66b1b02d928aefb9ef2149e Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Wed, 12 Feb 2020 20:17:30 +0800
Subject: [PATCH] antfs: bump to 07.19 (#3055)

---
 package/kernel/antfs/Makefile               |  9 +--
 package/kernel/antfs/patches/001-4.18.patch | 76 ---------------------
 2 files changed, 5 insertions(+), 80 deletions(-)
 delete mode 100644 package/kernel/antfs/patches/001-4.18.patch

diff --git a/package/kernel/antfs/Makefile b/package/kernel/antfs/Makefile
index 8a636f1d7..30143a395 100644
--- a/package/kernel/antfs/Makefile
+++ b/package/kernel/antfs/Makefile
@@ -4,11 +4,11 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=antfs
 PKG_RELEASE:=1
 
-PKG_SOURCE_URL:=https://github.com/Sembedded/antfs.git
+PKG_SOURCE_URL:=https://github.com/klukonin/antfs.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2018-08-14
-PKG_SOURCE_VERSION:=002407a1b4f1bc9ec19fb07a4c01fc5348d216a6
-PKG_MIRROR_HASH:=d1c44b2be92531c2caa4fa00b620591f95104436920640e94861f8207d6e9082
+PKG_SOURCE_DATE:=2020-02-10
+PKG_SOURCE_VERSION:=b41ba529f6b64b429527e09a06ce0326d5456c05
+PKG_MIRROR_HASH:=dae039c0fe5bf1a2c8c1cca4211d607a4d6f56fc41b38444e2234b40d710d9db
 
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
@@ -37,6 +37,7 @@ define Build/Compile
 		$(MAKE_OPTS) \
 		CONFIG_ANTFS_FS=m \
 		CONFIG_ANTFS_SYMLINKS=y \
+		ANTFS_VERSION=07.19-$(call version_abbrev,$(PKG_SOURCE_VERSION)) \
 		modules
 endef
 
diff --git a/package/kernel/antfs/patches/001-4.18.patch b/package/kernel/antfs/patches/001-4.18.patch
deleted file mode 100644
index 20d3dc4de..000000000
--- a/package/kernel/antfs/patches/001-4.18.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- a/dir.c
-+++ b/dir.c
-@@ -1133,9 +1133,12 @@ static int antfs_setattr(struct dentry *
- 		}
- #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)
- 		inode->i_mtime = inode->i_ctime = CURRENT_TIME_SEC;
--#else
-+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0)
- 		ktime_get_real_ts(&inode->i_mtime);
- 		ktime_get_real_ts(&inode->i_ctime);
-+#else
-+		ktime_get_real_ts64(&inode->i_mtime);
-+		ktime_get_real_ts64(&inode->i_ctime);
- #endif
- 		if (inode_needs_sync(inode)) {
- 			sync_mapping_buffers(inode->i_mapping);
---- a/include/ntfstime.h
-+++ b/include/ntfstime.h
-@@ -47,9 +47,15 @@
-  *
-  * Return:  A Unix time (number of seconds since 1970, and nanoseconds)
-  */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0)
- static inline struct timespec ntfs2timespec(sle64 ntfstime)
- {
- 	struct timespec spec;
-+#else
-+static inline struct timespec64 ntfs2timespec(sle64 ntfstime)
-+{
-+	struct timespec64 spec;
-+#endif
- 	uint64_t cputime;
- 
- 	cputime = sle64_to_cpu(ntfstime) - NTFS_TIME_OFFSET;
-@@ -79,7 +85,11 @@ static inline struct timespec ntfs2times
-  *
-  * Return:  An NTFS time (100ns units since Jan 1601)
-  */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0)
- static inline sle64 timespec2ntfs(struct timespec spec)
-+#else
-+static inline sle64 timespec2ntfs(struct timespec64 spec)
-+#endif
- {
- 	s64 units;
- 
-@@ -94,10 +104,15 @@ static inline sle64 timespec2ntfs(struct
- 
- static inline sle64 ntfs_current_time(void)
- {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0)
- 	struct timespec ts;
- 
- 	getnstimeofday(&ts);
-+#else
-+	struct timespec64 ts;
- 
-+	getnstimeofday64(&ts);
-+#endif
- 	return timespec2ntfs(ts);
- }
- 
---- a/inode.c
-+++ b/inode.c
-@@ -435,7 +435,11 @@ int antfs_inode_init(struct inode *inode
- 					inode->i_ino ==
- 					(unsigned long)FILE_ROOT))) {
- 		struct antfs_sb_info *sbi = ANTFS_SB(inode->i_sb);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0)
- 		struct timespec ts;
-+#else
-+		struct timespec64 ts;
-+#endif
- 
- 		/* Init a base mft record ("regular" inode):
- 		 * this has to be done in context of either: