mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-06-18 15:25:29 +08:00
antfs: bump to 07.19 (#3055)
This commit is contained in:
parent
624cdcef94
commit
53b019accf
@ -4,11 +4,11 @@ include $(INCLUDE_DIR)/kernel.mk
|
|||||||
PKG_NAME:=antfs
|
PKG_NAME:=antfs
|
||||||
PKG_RELEASE:=1
|
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_PROTO:=git
|
||||||
PKG_SOURCE_DATE:=2018-08-14
|
PKG_SOURCE_DATE:=2020-02-10
|
||||||
PKG_SOURCE_VERSION:=002407a1b4f1bc9ec19fb07a4c01fc5348d216a6
|
PKG_SOURCE_VERSION:=b41ba529f6b64b429527e09a06ce0326d5456c05
|
||||||
PKG_MIRROR_HASH:=d1c44b2be92531c2caa4fa00b620591f95104436920640e94861f8207d6e9082
|
PKG_MIRROR_HASH:=dae039c0fe5bf1a2c8c1cca4211d607a4d6f56fc41b38444e2234b40d710d9db
|
||||||
|
|
||||||
PKG_LICENSE:=GPL-2.0-only
|
PKG_LICENSE:=GPL-2.0-only
|
||||||
PKG_LICENSE_FILES:=LICENSE
|
PKG_LICENSE_FILES:=LICENSE
|
||||||
@ -37,6 +37,7 @@ define Build/Compile
|
|||||||
$(MAKE_OPTS) \
|
$(MAKE_OPTS) \
|
||||||
CONFIG_ANTFS_FS=m \
|
CONFIG_ANTFS_FS=m \
|
||||||
CONFIG_ANTFS_SYMLINKS=y \
|
CONFIG_ANTFS_SYMLINKS=y \
|
||||||
|
ANTFS_VERSION=07.19-$(call version_abbrev,$(PKG_SOURCE_VERSION)) \
|
||||||
modules
|
modules
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
@ -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:
|
|
Loading…
x
Reference in New Issue
Block a user