Applied post 1.9.0 fixes

1 files changed, 3 insertions, 2 deletions

diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index 8e1fbc384..f14f6df50 100644
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -64,9 +64,10 @@ int mkswap_main(int argc, char **argv)
         // Figure out how big the device is and announce our intentions.
 
         fd = xopen(argv[1], O_RDWR);
-        len = fdlength(fd);
+        len = lseek(fd, 0, SEEK_END);
+        lseek(fd, 0, SEEK_SET);
         pagesize = getpagesize();
-        printf("Setting up swapspace version 1, size = %"OFF_FMT"d bytes\n",
+        printf("Setting up swapspace version 1, size = %"OFF_FMT"u bytes\n",
                         len - pagesize);
         mkswap_selinux_setcontext(fd, argv[1]);