diff options
Diffstat (limited to 'fs')
-rw-r--r-- | fs/read_write.c | 18 | ||||
-rw-r--r-- | fs/xattr.c | 12 |
2 files changed, 15 insertions, 15 deletions
diff --git a/fs/read_write.c b/fs/read_write.c index 5cc6924eb158..940367f51f2a 100644 --- a/fs/read_write.c +++ b/fs/read_write.c | |||
@@ -147,7 +147,7 @@ loff_t vfs_llseek(struct file *file, loff_t offset, int origin) | |||
147 | } | 147 | } |
148 | EXPORT_SYMBOL(vfs_llseek); | 148 | EXPORT_SYMBOL(vfs_llseek); |
149 | 149 | ||
150 | asmlinkage off_t sys_lseek(unsigned int fd, off_t offset, unsigned int origin) | 150 | asmlinkage long sys_lseek(unsigned int fd, off_t offset, unsigned int origin) |
151 | { | 151 | { |
152 | off_t retval; | 152 | off_t retval; |
153 | struct file * file; | 153 | struct file * file; |
@@ -369,7 +369,7 @@ static inline void file_pos_write(struct file *file, loff_t pos) | |||
369 | file->f_pos = pos; | 369 | file->f_pos = pos; |
370 | } | 370 | } |
371 | 371 | ||
372 | asmlinkage ssize_t sys_read(unsigned int fd, char __user * buf, size_t count) | 372 | asmlinkage long sys_read(unsigned int fd, char __user * buf, size_t count) |
373 | { | 373 | { |
374 | struct file *file; | 374 | struct file *file; |
375 | ssize_t ret = -EBADF; | 375 | ssize_t ret = -EBADF; |
@@ -386,7 +386,7 @@ asmlinkage ssize_t sys_read(unsigned int fd, char __user * buf, size_t count) | |||
386 | return ret; | 386 | return ret; |
387 | } | 387 | } |
388 | 388 | ||
389 | asmlinkage ssize_t sys_write(unsigned int fd, const char __user * buf, size_t count) | 389 | asmlinkage long sys_write(unsigned int fd, const char __user * buf, size_t count) |
390 | { | 390 | { |
391 | struct file *file; | 391 | struct file *file; |
392 | ssize_t ret = -EBADF; | 392 | ssize_t ret = -EBADF; |
@@ -403,7 +403,7 @@ asmlinkage ssize_t sys_write(unsigned int fd, const char __user * buf, size_t co | |||
403 | return ret; | 403 | return ret; |
404 | } | 404 | } |
405 | 405 | ||
406 | asmlinkage ssize_t sys_pread64(unsigned int fd, char __user *buf, | 406 | asmlinkage long sys_pread64(unsigned int fd, char __user *buf, |
407 | size_t count, loff_t pos) | 407 | size_t count, loff_t pos) |
408 | { | 408 | { |
409 | struct file *file; | 409 | struct file *file; |
@@ -424,7 +424,7 @@ asmlinkage ssize_t sys_pread64(unsigned int fd, char __user *buf, | |||
424 | return ret; | 424 | return ret; |
425 | } | 425 | } |
426 | 426 | ||
427 | asmlinkage ssize_t sys_pwrite64(unsigned int fd, const char __user *buf, | 427 | asmlinkage long sys_pwrite64(unsigned int fd, const char __user *buf, |
428 | size_t count, loff_t pos) | 428 | size_t count, loff_t pos) |
429 | { | 429 | { |
430 | struct file *file; | 430 | struct file *file; |
@@ -672,7 +672,7 @@ ssize_t vfs_writev(struct file *file, const struct iovec __user *vec, | |||
672 | 672 | ||
673 | EXPORT_SYMBOL(vfs_writev); | 673 | EXPORT_SYMBOL(vfs_writev); |
674 | 674 | ||
675 | asmlinkage ssize_t | 675 | asmlinkage long |
676 | sys_readv(unsigned long fd, const struct iovec __user *vec, unsigned long vlen) | 676 | sys_readv(unsigned long fd, const struct iovec __user *vec, unsigned long vlen) |
677 | { | 677 | { |
678 | struct file *file; | 678 | struct file *file; |
@@ -693,7 +693,7 @@ sys_readv(unsigned long fd, const struct iovec __user *vec, unsigned long vlen) | |||
693 | return ret; | 693 | return ret; |
694 | } | 694 | } |
695 | 695 | ||
696 | asmlinkage ssize_t | 696 | asmlinkage long |
697 | sys_writev(unsigned long fd, const struct iovec __user *vec, unsigned long vlen) | 697 | sys_writev(unsigned long fd, const struct iovec __user *vec, unsigned long vlen) |
698 | { | 698 | { |
699 | struct file *file; | 699 | struct file *file; |
@@ -812,7 +812,7 @@ out: | |||
812 | return retval; | 812 | return retval; |
813 | } | 813 | } |
814 | 814 | ||
815 | asmlinkage ssize_t sys_sendfile(int out_fd, int in_fd, off_t __user *offset, size_t count) | 815 | asmlinkage long sys_sendfile(int out_fd, int in_fd, off_t __user *offset, size_t count) |
816 | { | 816 | { |
817 | loff_t pos; | 817 | loff_t pos; |
818 | off_t off; | 818 | off_t off; |
@@ -831,7 +831,7 @@ asmlinkage ssize_t sys_sendfile(int out_fd, int in_fd, off_t __user *offset, siz | |||
831 | return do_sendfile(out_fd, in_fd, NULL, count, 0); | 831 | return do_sendfile(out_fd, in_fd, NULL, count, 0); |
832 | } | 832 | } |
833 | 833 | ||
834 | asmlinkage ssize_t sys_sendfile64(int out_fd, int in_fd, loff_t __user *offset, size_t count) | 834 | asmlinkage long sys_sendfile64(int out_fd, int in_fd, loff_t __user *offset, size_t count) |
835 | { | 835 | { |
836 | loff_t pos; | 836 | loff_t pos; |
837 | ssize_t ret; | 837 | ssize_t ret; |
diff --git a/fs/xattr.c b/fs/xattr.c index 237804cd6b56..d049ae27aae7 100644 --- a/fs/xattr.c +++ b/fs/xattr.c | |||
@@ -349,7 +349,7 @@ getxattr(struct dentry *d, const char __user *name, void __user *value, | |||
349 | return error; | 349 | return error; |
350 | } | 350 | } |
351 | 351 | ||
352 | asmlinkage ssize_t | 352 | asmlinkage long |
353 | sys_getxattr(const char __user *pathname, const char __user *name, | 353 | sys_getxattr(const char __user *pathname, const char __user *name, |
354 | void __user *value, size_t size) | 354 | void __user *value, size_t size) |
355 | { | 355 | { |
@@ -364,7 +364,7 @@ sys_getxattr(const char __user *pathname, const char __user *name, | |||
364 | return error; | 364 | return error; |
365 | } | 365 | } |
366 | 366 | ||
367 | asmlinkage ssize_t | 367 | asmlinkage long |
368 | sys_lgetxattr(const char __user *pathname, const char __user *name, void __user *value, | 368 | sys_lgetxattr(const char __user *pathname, const char __user *name, void __user *value, |
369 | size_t size) | 369 | size_t size) |
370 | { | 370 | { |
@@ -379,7 +379,7 @@ sys_lgetxattr(const char __user *pathname, const char __user *name, void __user | |||
379 | return error; | 379 | return error; |
380 | } | 380 | } |
381 | 381 | ||
382 | asmlinkage ssize_t | 382 | asmlinkage long |
383 | sys_fgetxattr(int fd, const char __user *name, void __user *value, size_t size) | 383 | sys_fgetxattr(int fd, const char __user *name, void __user *value, size_t size) |
384 | { | 384 | { |
385 | struct file *f; | 385 | struct file *f; |
@@ -424,7 +424,7 @@ listxattr(struct dentry *d, char __user *list, size_t size) | |||
424 | return error; | 424 | return error; |
425 | } | 425 | } |
426 | 426 | ||
427 | asmlinkage ssize_t | 427 | asmlinkage long |
428 | sys_listxattr(const char __user *pathname, char __user *list, size_t size) | 428 | sys_listxattr(const char __user *pathname, char __user *list, size_t size) |
429 | { | 429 | { |
430 | struct path path; | 430 | struct path path; |
@@ -438,7 +438,7 @@ sys_listxattr(const char __user *pathname, char __user *list, size_t size) | |||
438 | return error; | 438 | return error; |
439 | } | 439 | } |
440 | 440 | ||
441 | asmlinkage ssize_t | 441 | asmlinkage long |
442 | sys_llistxattr(const char __user *pathname, char __user *list, size_t size) | 442 | sys_llistxattr(const char __user *pathname, char __user *list, size_t size) |
443 | { | 443 | { |
444 | struct path path; | 444 | struct path path; |
@@ -452,7 +452,7 @@ sys_llistxattr(const char __user *pathname, char __user *list, size_t size) | |||
452 | return error; | 452 | return error; |
453 | } | 453 | } |
454 | 454 | ||
455 | asmlinkage ssize_t | 455 | asmlinkage long |
456 | sys_flistxattr(int fd, char __user *list, size_t size) | 456 | sys_flistxattr(int fd, char __user *list, size_t size) |
457 | { | 457 | { |
458 | struct file *f; | 458 | struct file *f; |