diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-01-21 15:16:58 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-03-03 22:46:22 -0500 |
commit | 4a0fd5bf0fd0795af8f1be3b261f5cf146a4cb9b (patch) | |
tree | 8f8efa46a8e4e3fc1c3163f5021aff4f94aaa7fd /fs/read_write.c | |
parent | 07fe6e00f6cca6fef85a14a1dc3ed4f2e35d3f0b (diff) |
teach SYSCALL_DEFINE<n> how to deal with long long/unsigned long long
... and convert a bunch of SYSCALL_DEFINE ones to SYSCALL_DEFINE<n>,
killing the boilerplate crap around them.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/read_write.c')
-rw-r--r-- | fs/read_write.c | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/fs/read_write.c b/fs/read_write.c index a698eff457fb..dcfd58d95f44 100644 --- a/fs/read_write.c +++ b/fs/read_write.c | |||
@@ -487,8 +487,8 @@ SYSCALL_DEFINE3(write, unsigned int, fd, const char __user *, buf, | |||
487 | return ret; | 487 | return ret; |
488 | } | 488 | } |
489 | 489 | ||
490 | SYSCALL_DEFINE(pread64)(unsigned int fd, char __user *buf, | 490 | SYSCALL_DEFINE4(pread64, unsigned int, fd, char __user *, buf, |
491 | size_t count, loff_t pos) | 491 | size_t, count, loff_t, pos) |
492 | { | 492 | { |
493 | struct fd f; | 493 | struct fd f; |
494 | ssize_t ret = -EBADF; | 494 | ssize_t ret = -EBADF; |
@@ -506,17 +506,9 @@ SYSCALL_DEFINE(pread64)(unsigned int fd, char __user *buf, | |||
506 | 506 | ||
507 | return ret; | 507 | return ret; |
508 | } | 508 | } |
509 | #ifdef CONFIG_HAVE_SYSCALL_WRAPPERS | ||
510 | asmlinkage long SyS_pread64(long fd, long buf, long count, loff_t pos) | ||
511 | { | ||
512 | return SYSC_pread64((unsigned int) fd, (char __user *) buf, | ||
513 | (size_t) count, pos); | ||
514 | } | ||
515 | SYSCALL_ALIAS(sys_pread64, SyS_pread64); | ||
516 | #endif | ||
517 | 509 | ||
518 | SYSCALL_DEFINE(pwrite64)(unsigned int fd, const char __user *buf, | 510 | SYSCALL_DEFINE4(pwrite64, unsigned int, fd, const char __user *, buf, |
519 | size_t count, loff_t pos) | 511 | size_t, count, loff_t, pos) |
520 | { | 512 | { |
521 | struct fd f; | 513 | struct fd f; |
522 | ssize_t ret = -EBADF; | 514 | ssize_t ret = -EBADF; |
@@ -534,14 +526,6 @@ SYSCALL_DEFINE(pwrite64)(unsigned int fd, const char __user *buf, | |||
534 | 526 | ||
535 | return ret; | 527 | return ret; |
536 | } | 528 | } |
537 | #ifdef CONFIG_HAVE_SYSCALL_WRAPPERS | ||
538 | asmlinkage long SyS_pwrite64(long fd, long buf, long count, loff_t pos) | ||
539 | { | ||
540 | return SYSC_pwrite64((unsigned int) fd, (const char __user *) buf, | ||
541 | (size_t) count, pos); | ||
542 | } | ||
543 | SYSCALL_ALIAS(sys_pwrite64, SyS_pwrite64); | ||
544 | #endif | ||
545 | 529 | ||
546 | /* | 530 | /* |
547 | * Reduce an iovec's length in-place. Return the resulting number of segments | 531 | * Reduce an iovec's length in-place. Return the resulting number of segments |