Builds defines -D_FILE_OFFSET_BITS=64 which makes the original functions
anf macros behave same as their 64 suffixed counterparts. This also
helps in compiling with latest musl C library, where these macros and
functions are no more available under _GNU_SOURCE feature macro
Signed-off-by: Khem Raj
Cc: Laurent Vivier
---
linux-user/syscall.c | 153 +++
1 file changed, 39 insertions(+), 114 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 1f8c10f8ef..30d83ed162 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -795,8 +795,8 @@ safe_syscall6(ssize_t, copy_file_range, int, infd, loff_t
*, pinoff,
*/
#define safe_ioctl(...) safe_syscall(__NR_ioctl, __VA_ARGS__)
/* Similarly for fcntl. Note that callers must always:
- * pass the F_GETLK64 etc constants rather than the unsuffixed F_GETLK
- * use the flock64 struct rather than unsuffixed flock
+ * pass the F_GETLK etc constants rather than the unsuffixed F_GETLK
+ * use the flock struct rather than unsuffixed flock
* This will then work and use a 64-bit offset for both 32-bit and 64-bit
hosts.
*/
#ifdef __NR_fcntl64
@@ -6797,13 +6797,13 @@ static int target_to_host_fcntl_cmd(int cmd)
ret = cmd;
break;
case TARGET_F_GETLK:
-ret = F_GETLK64;
+ret = F_GETLK;
break;
case TARGET_F_SETLK:
-ret = F_SETLK64;
+ret = F_SETLK;
break;
case TARGET_F_SETLKW:
-ret = F_SETLKW64;
+ret = F_SETLKW;
break;
case TARGET_F_GETOWN:
ret = F_GETOWN;
@@ -6817,17 +6817,6 @@ static int target_to_host_fcntl_cmd(int cmd)
case TARGET_F_SETSIG:
ret = F_SETSIG;
break;
-#if TARGET_ABI_BITS == 32
-case TARGET_F_GETLK64:
-ret = F_GETLK64;
-break;
-case TARGET_F_SETLK64:
-ret = F_SETLK64;
-break;
-case TARGET_F_SETLKW64:
-ret = F_SETLKW64;
-break;
-#endif
case TARGET_F_SETLEASE:
ret = F_SETLEASE;
break;
@@ -6879,8 +6868,8 @@ static int target_to_host_fcntl_cmd(int cmd)
* them to 5, 6 and 7 before making the syscall(). Since we make the
* syscall directly, adjust to what is supported by the kernel.
*/
-if (ret >= F_GETLK64 && ret <= F_SETLKW64) {
-ret -= F_GETLK64 - 5;
+if (ret >= F_GETLK && ret <= F_SETLKW) {
+ret -= F_GETLK - 5;
}
#endif
@@ -6913,55 +6902,11 @@ static int host_to_target_flock(int type)
return type;
}
-static inline abi_long copy_from_user_flock(struct flock64 *fl,
-abi_ulong target_flock_addr)
-{
-struct target_flock *target_fl;
-int l_type;
-
-if (!lock_user_struct(VERIFY_READ, target_fl, target_flock_addr, 1)) {
-return -TARGET_EFAULT;
-}
-
-__get_user(l_type, &target_fl->l_type);
-l_type = target_to_host_flock(l_type);
-if (l_type < 0) {
-return l_type;
-}
-fl->l_type = l_type;
-__get_user(fl->l_whence, &target_fl->l_whence);
-__get_user(fl->l_start, &target_fl->l_start);
-__get_user(fl->l_len, &target_fl->l_len);
-__get_user(fl->l_pid, &target_fl->l_pid);
-unlock_user_struct(target_fl, target_flock_addr, 0);
-return 0;
-}
-
-static inline abi_long copy_to_user_flock(abi_ulong target_flock_addr,
- const struct flock64 *fl)
-{
-struct target_flock *target_fl;
-short l_type;
-
-if (!lock_user_struct(VERIFY_WRITE, target_fl, target_flock_addr, 0)) {
-return -TARGET_EFAULT;
-}
-
-l_type = host_to_target_flock(fl->l_type);
-__put_user(l_type, &target_fl->l_type);
-__put_user(fl->l_whence, &target_fl->l_whence);
-__put_user(fl->l_start, &target_fl->l_start);
-__put_user(fl->l_len, &target_fl->l_len);
-__put_user(fl->l_pid, &target_fl->l_pid);
-unlock_user_struct(target_fl, target_flock_addr, 1);
-return 0;
-}
-
-typedef abi_long from_flock64_fn(struct flock64 *fl, abi_ulong target_addr);
-typedef abi_long to_flock64_fn(abi_ulong target_addr, const struct flock64
*fl);
+typedef abi_long from_flock_fn(struct flock *fl, abi_ulong target_addr);
+typedef abi_long to_flock_fn(abi_ulong target_addr, const struct flock *fl);
#if defined(TARGET_ARM) && TARGET_ABI_BITS == 32
-struct target_oabi_flock64 {
+struct target_oabi_flock {
abi_short l_type;
abi_short l_whence;
abi_llong l_start;
@@ -6969,10 +6914,10 @@ struct target_oabi_flock64 {
abi_int l_pid;
} QEMU_PACKED;
-static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl,
+static inline abi_long copy_from_user_oabi_flock(struct flock *fl,
abi_ulong target_flock_addr)
{
-struct target_oabi_flock64 *target_fl;
+struct target_oabi_flock *target_fl;
int l_type;
if (!lock_user_struct(VERIFY_READ, target_fl, target_flock_addr, 1)) {
@@ -6993,
