summaryrefslogtreecommitdiffstats
path: root/disk-utils
diff options
context:
space:
mode:
authorSami Kerola2019-01-07 23:23:04 +0100
committerSami Kerola2019-01-12 09:46:54 +0100
commitad7ac3d598e2d541d9eba70975e68dff7e52c7d9 (patch)
treec402ce290f8de90f8e5e5a37a6ab68fae6bcafd9 /disk-utils
parenthwclock: use monotonic time to measure how long setting time takes (diff)
downloadkernel-qcow2-util-linux-ad7ac3d598e2d541d9eba70975e68dff7e52c7d9.tar.gz
kernel-qcow2-util-linux-ad7ac3d598e2d541d9eba70975e68dff7e52c7d9.tar.xz
kernel-qcow2-util-linux-ad7ac3d598e2d541d9eba70975e68dff7e52c7d9.zip
fsck.cramfs: use utimes() instead of utime() that is obsolete
Reference: http://man7.org/linux/man-pages/man3/utime.3p.html#APPLICATION_USAGE Signed-off-by: Sami Kerola <kerolasa@iki.fi>
Diffstat (limited to 'disk-utils')
-rw-r--r--disk-utils/fsck.cramfs.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/disk-utils/fsck.cramfs.c b/disk-utils/fsck.cramfs.c
index 0d9bdadf7..76ed303b0 100644
--- a/disk-utils/fsck.cramfs.c
+++ b/disk-utils/fsck.cramfs.c
@@ -42,7 +42,6 @@
#include <errno.h>
#include <string.h>
#include <getopt.h>
-#include <utime.h>
#include <fcntl.h>
/* We don't use our include/crc32.h, but crc32 from zlib!
@@ -52,6 +51,7 @@
*/
#include <zlib.h>
+#include <sys/time.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/mman.h>
@@ -419,7 +419,7 @@ static void do_uncompress(char *path, int outfd, unsigned long offset,
static void change_file_status(char *path, struct cramfs_inode *i)
{
- struct utimbuf epoch = { 0, 0 };
+ const struct timeval epoch = { 0, 0 };
if (euid == 0) {
if (lchown(path, i->uid, i->gid) < 0)
@@ -431,8 +431,8 @@ static void change_file_status(char *path, struct cramfs_inode *i)
}
if (S_ISLNK(i->mode))
return;
- if (utime(path, &epoch) < 0)
- err(FSCK_EX_ERROR, _("utime failed: %s"), path);
+ if (utimes(path, &epoch) < 0)
+ err(FSCK_EX_ERROR, _("utimes failed: %s"), path);
}
static void do_directory(char *path, struct cramfs_inode *i)