2 files changed, 12 insertions, 6 deletions

diff --git a/fs/compat.c b/fs/compat.c
index 1c859dae758f..3f84d5f15889 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -1236,7 +1236,7 @@ compat_sys_readv(unsigned long fd, const struct compat_iovec __user *vec,
 
 asmlinkage ssize_t
 compat_sys_preadv(unsigned long fd, const struct compat_iovec __user *vec,
-                  unsigned long vlen, u32 pos_high, u32 pos_low)
+                  unsigned long vlen, u32 pos_low, u32 pos_high)
 {
         loff_t pos = ((loff_t)pos_high << 32) | pos_low;
         struct file *file;
@@ -1293,7 +1293,7 @@ compat_sys_writev(unsigned long fd, const struct compat_iovec __user *vec,
 
 asmlinkage ssize_t
 compat_sys_pwritev(unsigned long fd, const struct compat_iovec __user *vec,
-                   unsigned long vlen, u32 pos_high, u32 pos_low)
+                   unsigned long vlen, u32 pos_low, u32 pos_high)
 {
         loff_t pos = ((loff_t)pos_high << 32) | pos_low;
         struct file *file;
diff --git a/fs/read_write.c b/fs/read_write.c
index 6d5d8ff238aa..9d1e76bb9ee1 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -731,10 +731,16 @@ SYSCALL_DEFINE3(writev, unsigned long, fd, const struct iovec __user *, vec,
         return ret;
 }
 
+static inline loff_t pos_from_hilo(unsigned long high, unsigned long low)
+{
+#define HALF_LONG_BITS (BITS_PER_LONG / 2)
+        return (((loff_t)high << HALF_LONG_BITS) << HALF_LONG_BITS) | low;
+}
+
 SYSCALL_DEFINE5(preadv, unsigned long, fd, const struct iovec __user *, vec,
-                unsigned long, vlen, u32, pos_high, u32, pos_low)
+                unsigned long, vlen, unsigned long, pos_l, unsigned long, pos_h)
 {
-        loff_t pos = ((loff_t)pos_high << 32) | pos_low;
+        loff_t pos = pos_from_hilo(pos_h, pos_l);
         struct file *file;
         ssize_t ret = -EBADF;
         int fput_needed;
@@ -757,9 +763,9 @@ SYSCALL_DEFINE5(preadv, unsigned long, fd, const struct iovec __user *, vec,
 }
 
 SYSCALL_DEFINE5(pwritev, unsigned long, fd, const struct iovec __user *, vec,
-                unsigned long, vlen, u32, pos_high, u32, pos_low)
+                unsigned long, vlen, unsigned long, pos_l, unsigned long, pos_h)
 {
-        loff_t pos = ((loff_t)pos_high << 32) | pos_low;
+        loff_t pos = pos_from_hilo(pos_h, pos_l);
         struct file *file;
         ssize_t ret = -EBADF;
         int fput_needed;