mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-15 18:03:30 +00:00
76 lines
2.2 KiB
Diff
76 lines
2.2 KiB
Diff
--- a/init/Kconfig
|
|
+++ b/init/Kconfig
|
|
@@ -1347,16 +1347,6 @@ config BOOT_CONFIG_EMBED_FILE
|
|
This bootconfig will be used if there is no initrd or no other
|
|
bootconfig in the initrd.
|
|
|
|
-config INITRAMFS_PRESERVE_MTIME
|
|
- bool "Preserve cpio archive mtimes in initramfs"
|
|
- default y
|
|
- help
|
|
- Each entry in an initramfs cpio archive carries an mtime value. When
|
|
- enabled, extracted cpio items take this mtime, with directory mtime
|
|
- setting deferred until after creation of any child entries.
|
|
-
|
|
- If unsure, say Y.
|
|
-
|
|
choice
|
|
prompt "Compiler optimization level"
|
|
default CC_OPTIMIZE_FOR_PERFORMANCE
|
|
--- a/init/initramfs.c
|
|
+++ b/init/initramfs.c
|
|
@@ -121,17 +121,15 @@ static void __init free_hash(void)
|
|
}
|
|
}
|
|
|
|
-#ifdef CONFIG_INITRAMFS_PRESERVE_MTIME
|
|
-static void __init do_utime(char *filename, time64_t mtime)
|
|
+static long __init do_utime(char *filename, time64_t mtime)
|
|
{
|
|
- struct timespec64 t[2] = { { .tv_sec = mtime }, { .tv_sec = mtime } };
|
|
- init_utimes(filename, t);
|
|
-}
|
|
+ struct timespec64 t[2];
|
|
|
|
-static void __init do_utime_path(const struct path *path, time64_t mtime)
|
|
-{
|
|
- struct timespec64 t[2] = { { .tv_sec = mtime }, { .tv_sec = mtime } };
|
|
- vfs_utimes(path, t);
|
|
+ t[0].tv_sec = mtime;
|
|
+ t[0].tv_nsec = 0;
|
|
+ t[1].tv_sec = mtime;
|
|
+ t[1].tv_nsec = 0;
|
|
+ return init_utimes(filename, t);
|
|
}
|
|
|
|
static __initdata LIST_HEAD(dir_list);
|
|
@@ -164,12 +162,6 @@ static void __init dir_utime(void)
|
|
kfree(de);
|
|
}
|
|
}
|
|
-#else
|
|
-static void __init do_utime(char *filename, time64_t mtime) {}
|
|
-static void __init do_utime_path(const struct path *path, time64_t mtime) {}
|
|
-static void __init dir_add(const char *name, time64_t mtime) {}
|
|
-static void __init dir_utime(void) {}
|
|
-#endif
|
|
|
|
static __initdata time64_t mtime;
|
|
|
|
@@ -401,10 +393,14 @@ static int __init do_name(void)
|
|
static int __init do_copy(void)
|
|
{
|
|
if (byte_count >= body_len) {
|
|
+ struct timespec64 t[2] = { };
|
|
if (xwrite(wfile, victim, body_len, &wfile_pos) != body_len)
|
|
error("write error");
|
|
|
|
- do_utime_path(&wfile->f_path, mtime);
|
|
+ t[0].tv_sec = mtime;
|
|
+ t[1].tv_sec = mtime;
|
|
+ vfs_utimes(&wfile->f_path, t);
|
|
+
|
|
fput(wfile);
|
|
if (csum_present && io_csum != hdr_csum)
|
|
error("bad data checksum");
|