Don't bother saving away the pathname and just use the new struct path based utimes helper instead.
Signed-off-by: Christoph Hellwig <[email protected]> --- init/initramfs.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/init/initramfs.c b/init/initramfs.c index c335920e5ecc2d..3823d15e5d2619 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -201,7 +201,6 @@ static inline void __init eat(unsigned n) byte_count -= n; } -static __initdata char *vcollected; static __initdata char *collected; static long remains __initdata; static __initdata char *collect; @@ -342,7 +341,6 @@ static int __init do_name(void) vfs_fchmod(wfile, mode); if (body_len) vfs_truncate(&wfile->f_path, body_len); - vcollected = kstrdup(collected, GFP_KERNEL); state = CopyFile; } } else if (S_ISDIR(mode)) { @@ -365,11 +363,16 @@ 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) != body_len) error("write error"); + + t[0].tv_sec = mtime; + t[1].tv_sec = mtime; + vfs_utimes(&wfile->f_path, t); + fput(wfile); - do_utime(vcollected, mtime); - kfree(vcollected); eat(body_len); state = SkipIt; return 0; -- 2.27.0
