diff options
Diffstat (limited to 'fs/compat.c')
-rw-r--r-- | fs/compat.c | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/fs/compat.c b/fs/compat.c index 14483a715bbb..f2944ace7a7b 100644 --- a/fs/compat.c +++ b/fs/compat.c | |||
@@ -1170,10 +1170,9 @@ compat_sys_readv(unsigned long fd, const struct compat_iovec __user *vec, | |||
1170 | } | 1170 | } |
1171 | 1171 | ||
1172 | asmlinkage ssize_t | 1172 | asmlinkage ssize_t |
1173 | compat_sys_preadv(unsigned long fd, const struct compat_iovec __user *vec, | 1173 | compat_sys_preadv64(unsigned long fd, const struct compat_iovec __user *vec, |
1174 | unsigned long vlen, u32 pos_low, u32 pos_high) | 1174 | unsigned long vlen, loff_t pos) |
1175 | { | 1175 | { |
1176 | loff_t pos = ((loff_t)pos_high << 32) | pos_low; | ||
1177 | struct file *file; | 1176 | struct file *file; |
1178 | int fput_needed; | 1177 | int fput_needed; |
1179 | ssize_t ret; | 1178 | ssize_t ret; |
@@ -1190,6 +1189,14 @@ compat_sys_preadv(unsigned long fd, const struct compat_iovec __user *vec, | |||
1190 | return ret; | 1189 | return ret; |
1191 | } | 1190 | } |
1192 | 1191 | ||
1192 | asmlinkage ssize_t | ||
1193 | compat_sys_preadv(unsigned long fd, const struct compat_iovec __user *vec, | ||
1194 | unsigned long vlen, u32 pos_low, u32 pos_high) | ||
1195 | { | ||
1196 | loff_t pos = ((loff_t)pos_high << 32) | pos_low; | ||
1197 | return compat_sys_preadv64(fd, vec, vlen, pos); | ||
1198 | } | ||
1199 | |||
1193 | static size_t compat_writev(struct file *file, | 1200 | static size_t compat_writev(struct file *file, |
1194 | const struct compat_iovec __user *vec, | 1201 | const struct compat_iovec __user *vec, |
1195 | unsigned long vlen, loff_t *pos) | 1202 | unsigned long vlen, loff_t *pos) |
@@ -1229,10 +1236,9 @@ compat_sys_writev(unsigned long fd, const struct compat_iovec __user *vec, | |||
1229 | } | 1236 | } |
1230 | 1237 | ||
1231 | asmlinkage ssize_t | 1238 | asmlinkage ssize_t |
1232 | compat_sys_pwritev(unsigned long fd, const struct compat_iovec __user *vec, | 1239 | compat_sys_pwritev64(unsigned long fd, const struct compat_iovec __user *vec, |
1233 | unsigned long vlen, u32 pos_low, u32 pos_high) | 1240 | unsigned long vlen, loff_t pos) |
1234 | { | 1241 | { |
1235 | loff_t pos = ((loff_t)pos_high << 32) | pos_low; | ||
1236 | struct file *file; | 1242 | struct file *file; |
1237 | int fput_needed; | 1243 | int fput_needed; |
1238 | ssize_t ret; | 1244 | ssize_t ret; |
@@ -1249,6 +1255,14 @@ compat_sys_pwritev(unsigned long fd, const struct compat_iovec __user *vec, | |||
1249 | return ret; | 1255 | return ret; |
1250 | } | 1256 | } |
1251 | 1257 | ||
1258 | asmlinkage ssize_t | ||
1259 | compat_sys_pwritev(unsigned long fd, const struct compat_iovec __user *vec, | ||
1260 | unsigned long vlen, u32 pos_low, u32 pos_high) | ||
1261 | { | ||
1262 | loff_t pos = ((loff_t)pos_high << 32) | pos_low; | ||
1263 | return compat_sys_pwritev64(fd, vec, vlen, pos); | ||
1264 | } | ||
1265 | |||
1252 | asmlinkage long | 1266 | asmlinkage long |
1253 | compat_sys_vmsplice(int fd, const struct compat_iovec __user *iov32, | 1267 | compat_sys_vmsplice(int fd, const struct compat_iovec __user *iov32, |
1254 | unsigned int nr_segs, unsigned int flags) | 1268 | unsigned int nr_segs, unsigned int flags) |