From 30c0529d27edca148a6e5e52bcdd7b38d6cb28b2 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 16 Dec 2010 22:53:34 -0500 Subject: [PATCH] e4defrag: Fix the overflow in e4defrag with > 2GB files The fallocate() interface on 32-bit machines is defined to use off_t, not loff_t (even though the system call interface is 64-bit clean). This causes e4defrag to fail on files greater than 2GB. Fix this by trying to use fallocate64(), and using the hard-coded syscall if it does not exist. Signed-off-by: "Theodore Ts'o" --- configure | 2 +- configure.in | 2 +- misc/e4defrag.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 14d9652..2f5515a 100755 --- a/configure +++ b/configure @@ -10699,7 +10699,7 @@ if test "$ac_res" != no; then : fi fi -for ac_func in chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit sync_file_range posix_fadvise fallocate blkid_probe_get_topology mbstowcs +for ac_func in chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit sync_file_range posix_fadvise fallocate fallocate64 blkid_probe_get_topology mbstowcs do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" diff --git a/configure.in b/configure.in index 5e67688..f9fffc1 100644 --- a/configure.in +++ b/configure.in @@ -853,7 +853,7 @@ if test -n "$BLKID_CMT"; then AC_SEARCH_LIBS([blkid_probe_all], [blkid]) fi dnl -AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit sync_file_range posix_fadvise fallocate blkid_probe_get_topology mbstowcs) +AC_CHECK_FUNCS(chflags getrusage llseek lseek64 open64 fstat64 ftruncate64 getmntinfo strtoull strcasecmp srandom jrand48 fchown mallinfo fdatasync strnlen strptime strdup sysconf pathconf posix_memalign memalign valloc __secure_getenv prctl mmap utime setresuid setresgid usleep nanosleep getdtablesize getrlimit sync_file_range posix_fadvise fallocate fallocate64 blkid_probe_get_topology mbstowcs) dnl dnl Check to see if -lsocket is required (solaris) to make something dnl that uses socket() to compile; this is needed for the UUID library diff --git a/misc/e4defrag.c b/misc/e4defrag.c index 83625fc..e795987 100644 --- a/misc/e4defrag.c +++ b/misc/e4defrag.c @@ -327,7 +327,7 @@ int sync_file_range(int fd, loff_t offset, loff_t length, unsigned int flag) } #endif /* ! HAVE_SYNC_FILE_RANGE */ -#ifndef HAVE_FALLOCATE +#ifndef HAVE_FALLOCATE64 #warning Using locally defined fallocate syscall interface. #ifndef __NR_fallocate @@ -335,14 +335,14 @@ int sync_file_range(int fd, loff_t offset, loff_t length, unsigned int flag) #endif /* - * fallocate() - Manipulate file space. + * fallocate64() - Manipulate file space. * * @fd: defrag target file's descriptor. * @mode: process flag. * @offset: file offset. * @len: file size. */ -static int fallocate(int fd, int mode, loff_t offset, loff_t len) +static int fallocate64(int fd, int mode, loff_t offset, loff_t len) { return syscall(__NR_fallocate, fd, mode, offset, len); } @@ -1738,7 +1738,7 @@ static int file_defrag(const char *file, const struct stat64 *buf, /* Allocate space for donor inode */ orig_group_tmp = orig_group_head; do { - ret = fallocate(donor_fd, 0, + ret = fallocate64(donor_fd, 0, (loff_t)orig_group_tmp->start->data.logical * block_size, (loff_t)orig_group_tmp->len * block_size); if (ret < 0) { -- 1.8.3.1