Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a0fd5bf authored by Al Viro's avatar Al Viro
Browse files

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: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 07fe6e00

arch/s390/kernel/sys_s390.c

+2 −12
Original line number Diff line number Diff line
@@ -132,19 +132,9 @@ SYSCALL_DEFINE1(s390_fadvise64_64, struct fadvise64_64_args __user *, args) 
 * to

 *   %r2: fd, %r3: mode, %r4/%r5: offset, 96(%r15)-103(%r15): len

 */

SYSCALL_DEFINE(s390_fallocate)(int fd, int mode, loff_t offset,

			       u32 len_high, u32 len_low)

SYSCALL_DEFINE5(s390_fallocate, int, fd, int, mode, loff_t, offset,

			       u32, len_high, u32, len_low)

{

	return sys_fallocate(fd, mode, offset, ((u64)len_high << 32) | len_low);

}

#ifdef CONFIG_HAVE_SYSCALL_WRAPPERS

asmlinkage long SyS_s390_fallocate(long fd, long mode, loff_t offset,

				   long len_high, long len_low)

{

	return SYSC_s390_fallocate((int) fd, (int) mode, offset,

				   (u32) len_high, (u32) len_low);

}

SYSCALL_ALIAS(sys_s390_fallocate, SyS_s390_fallocate);

#endif



#endif

fs/dcookies.c

+1 −8
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ int get_dcookie(struct path *path, unsigned long *cookie) 
/* And here is where the userspace process can look up the cookie value

 * to retrieve the path.

 */

SYSCALL_DEFINE(lookup_dcookie)(u64 cookie64, char __user * buf, size_t len)

SYSCALL_DEFINE3(lookup_dcookie, u64, cookie64, char __user *, buf, size_t, len)

{

	unsigned long cookie = (unsigned long)cookie64;

	int err = -EINVAL;
@@ -201,13 +201,6 @@ SYSCALL_DEFINE(lookup_dcookie)(u64 cookie64, char __user * buf, size_t len) 
	mutex_unlock(&dcookie_mutex);

	return err;

}

#ifdef CONFIG_HAVE_SYSCALL_WRAPPERS

asmlinkage long SyS_lookup_dcookie(u64 cookie64, long buf, long len)

{

	return SYSC_lookup_dcookie(cookie64, (char __user *) buf, (size_t) len);

}

SYSCALL_ALIAS(sys_lookup_dcookie, SyS_lookup_dcookie);

#endif



static int dcookie_init(void)

{

fs/notify/fanotify/fanotify_user.c

+3 −14
Original line number Diff line number Diff line
@@ -755,9 +755,9 @@ SYSCALL_DEFINE2(fanotify_init, unsigned int, flags, unsigned int, event_f_flags) 
	return fd;

}



SYSCALL_DEFINE(fanotify_mark)(int fanotify_fd, unsigned int flags,

			      __u64 mask, int dfd,

			      const char  __user * pathname)

SYSCALL_DEFINE5(fanotify_mark, int, fanotify_fd, unsigned int, flags,

			      __u64, mask, int, dfd,

			      const char  __user *, pathname)

{

	struct inode *inode = NULL;

	struct vfsmount *mnt = NULL;
@@ -857,17 +857,6 @@ SYSCALL_DEFINE(fanotify_mark)(int fanotify_fd, unsigned int flags, 
	return ret;

}



#ifdef CONFIG_HAVE_SYSCALL_WRAPPERS

asmlinkage long SyS_fanotify_mark(long fanotify_fd, long flags, __u64 mask,

				  long dfd, long pathname)

{

	return SYSC_fanotify_mark((int) fanotify_fd, (unsigned int) flags,

				  mask, (int) dfd,

				  (const char  __user *) pathname);

}

SYSCALL_ALIAS(sys_fanotify_mark, SyS_fanotify_mark);

#endif



/*

 * fanotify_user_setup - Our initialization function.  Note that we cannot return

 * error because we have compiled-in VFS hooks.  So an (unlikely) failure here

fs/open.c

+3 −25
Original line number Diff line number Diff line
@@ -212,32 +212,18 @@ COMPAT_SYSCALL_DEFINE2(ftruncate, unsigned int, fd, compat_ulong_t, length) 


/* LFS versions of truncate are only needed on 32 bit machines */

#if BITS_PER_LONG == 32

SYSCALL_DEFINE(truncate64)(const char __user * path, loff_t length)

SYSCALL_DEFINE2(truncate64, const char __user *, path, loff_t, length)

{

	return do_sys_truncate(path, length);

}

#ifdef CONFIG_HAVE_SYSCALL_WRAPPERS

asmlinkage long SyS_truncate64(long path, loff_t length)

{

	return SYSC_truncate64((const char __user *) path, length);

}

SYSCALL_ALIAS(sys_truncate64, SyS_truncate64);

#endif



SYSCALL_DEFINE(ftruncate64)(unsigned int fd, loff_t length)

SYSCALL_DEFINE2(ftruncate64, unsigned int, fd, loff_t, length)

{

	long ret = do_sys_ftruncate(fd, length, 0);

	/* avoid REGPARM breakage on x86: */

	asmlinkage_protect(2, ret, fd, length);

	return ret;

}

#ifdef CONFIG_HAVE_SYSCALL_WRAPPERS

asmlinkage long SyS_ftruncate64(long fd, loff_t length)

{

	return SYSC_ftruncate64((unsigned int) fd, length);

}

SYSCALL_ALIAS(sys_ftruncate64, SyS_ftruncate64);

#endif

#endif /* BITS_PER_LONG == 32 */
@@ -299,7 +285,7 @@ int do_fallocate(struct file *file, int mode, loff_t offset, loff_t len) 
	return ret;

}



SYSCALL_DEFINE(fallocate)(int fd, int mode, loff_t offset, loff_t len)

SYSCALL_DEFINE4(fallocate, int, fd, int, mode, loff_t, offset, loff_t, len)

{

	struct fd f = fdget(fd);

	int error = -EBADF;
@@ -311,14 +297,6 @@ SYSCALL_DEFINE(fallocate)(int fd, int mode, loff_t offset, loff_t len) 
	return error;

}



#ifdef CONFIG_HAVE_SYSCALL_WRAPPERS

asmlinkage long SyS_fallocate(long fd, long mode, loff_t offset, loff_t len)

{

	return SYSC_fallocate((int)fd, (int)mode, offset, len);

}

SYSCALL_ALIAS(sys_fallocate, SyS_fallocate);

#endif



/*

 * access() needs to use the real uid/gid, not the effective uid/gid.

 * We do this by temporarily clearing all FS-related capabilities and

fs/read_write.c

+4 −20
Original line number Diff line number Diff line
@@ -487,8 +487,8 @@ SYSCALL_DEFINE3(write, unsigned int, fd, const char __user *, buf, 
	return ret;

}



SYSCALL_DEFINE(pread64)(unsigned int fd, char __user *buf,

			size_t count, loff_t pos)

SYSCALL_DEFINE4(pread64, unsigned int, fd, char __user *, buf,

			size_t, count, loff_t, pos)

{

	struct fd f;

	ssize_t ret = -EBADF;
@@ -506,17 +506,9 @@ SYSCALL_DEFINE(pread64)(unsigned int fd, char __user *buf, 


	return ret;

}

#ifdef CONFIG_HAVE_SYSCALL_WRAPPERS

asmlinkage long SyS_pread64(long fd, long buf, long count, loff_t pos)

{

	return SYSC_pread64((unsigned int) fd, (char __user *) buf,

			    (size_t) count, pos);

}

SYSCALL_ALIAS(sys_pread64, SyS_pread64);

#endif



SYSCALL_DEFINE(pwrite64)(unsigned int fd, const char __user *buf,

			 size_t count, loff_t pos)

SYSCALL_DEFINE4(pwrite64, unsigned int, fd, const char __user *, buf,

			 size_t, count, loff_t, pos)

{

	struct fd f;

	ssize_t ret = -EBADF;
@@ -534,14 +526,6 @@ SYSCALL_DEFINE(pwrite64)(unsigned int fd, const char __user *buf, 


	return ret;

}

#ifdef CONFIG_HAVE_SYSCALL_WRAPPERS

asmlinkage long SyS_pwrite64(long fd, long buf, long count, loff_t pos)

{

	return SYSC_pwrite64((unsigned int) fd, (const char __user *) buf,

			     (size_t) count, pos);

}

SYSCALL_ALIAS(sys_pwrite64, SyS_pwrite64);

#endif



/*

 * Reduce an iovec's length in-place.  Return the resulting number of segments