[kpartx] use lseek64 instead of self-defined syscall

Hannes Reinecke, Suse

diff --git a/kpartx/Makefile b/kpartx/Makefile
index 35b7420..5d4eafb 100644 (file)
--- a/kpartx/Makefile
+++ b/kpartx/Makefile
@@ -6,7 +6,7 @@ BUILD=glibc
 
 include ../Makefile.inc
 
-CFLAGS = -pipe -g -Wall -Wunused -Wstrict-prototypes -I.
+CFLAGS = -pipe -g -Wall -Wunused -Wstrict-prototypes -I. -D_LARGEFILE64_SOURCE
 
 ifeq ($(strip $(BUILD)),klibc)
        OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o gpt.o crc32.o \

diff --git a/kpartx/kpartx.c b/kpartx/kpartx.c
index 5830312..8cf3749 100644 (file)
--- a/kpartx/kpartx.c
+++ b/kpartx/kpartx.c
@@ -464,27 +464,14 @@ xmalloc (size_t size) {
 /*
  * sseek: seek to specified sector
  */
-#if !defined (__alpha__) && !defined (__ia64__) && !defined (__x86_64__) \
-       && !defined (__s390x__)
-#include <linux/unistd.h>       /* _syscall */
-static
-_syscall5(int,  _llseek,  uint,  fd, ulong, hi, ulong, lo,
-         long long *, res, uint, wh);
-#endif
 
 static int
 sseek(int fd, unsigned int secnr) {
-       long long in, out;
-       in = ((long long) secnr << 9);
+       off64_t in, out;
+       in = ((off64_t) secnr << 9);
        out = 1;
 
-#if !defined (__alpha__) && !defined (__ia64__) && !defined (__x86_64__) \
-       && !defined (__s390x__)
-       if (_llseek (fd, in>>32, in & 0xffffffff, &out, SEEK_SET) != 0
-           || out != in)
-#else
-       if ((out = lseek(fd, in, SEEK_SET)) != in)
-#endif
+       if ((out = lseek64(fd, in, SEEK_SET)) != in)
        {
                fprintf(stderr, "llseek error\n");
                return -1;