From: Al Viro <viro@zeniv.linux.org.uk>
Date: Fri, 18 Mar 2016 20:07:38 +0000 (-0400)
Subject: Merge branches 'work.lookups', 'work.misc' and 'work.preadv2' into for-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8b23a8ce1094f25a85826e25217c5b9779a4f5aa;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branches 'work.lookups', 'work.misc' and 'work.preadv2' into for-next
---

8b23a8ce1094f25a85826e25217c5b9779a4f5aa
diff --cc fs/read_write.c
index dadf24e5c95b,dadf24e5c95b,324ec271cc4e,07c53db04ec1..cf377cf9dfe3
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@@@@ -1188,8 -1188,8 -1187,8 -1275,21 +1276,21 @@@@@ COMPAT_SYSCALL_DEFINE5(pwritev, compat_
    {
    	loff_t pos = ((loff_t)pos_high << 32) | pos_low;
    
--- 	return __compat_sys_pwritev64(fd, vec, vlen, pos);
+++ 	return do_compat_pwritev64(fd, vec, vlen, pos, 0);
++  }
+++ 
+++ COMPAT_SYSCALL_DEFINE6(pwritev2, compat_ulong_t, fd,
+++ 		const struct compat_iovec __user *,vec,
+++ 		compat_ulong_t, vlen, u32, pos_low, u32, pos_high, int, flags)
+++ {
+++ 	loff_t pos = ((loff_t)pos_high << 32) | pos_low;
+++ 
+++ 	if (pos == -1)
+++ 		return do_compat_writev(fd, vec, vlen, flags);
+++ 
+++ 	return do_compat_pwritev64(fd, vec, vlen, pos, flags);
  + }
+++ 
    #endif
    
    static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos,