Commit 166e07c3 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

fs: remove ksys_open 



Just open code it in the two callers.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fb2da16c

fs/open.c

+8 −3
Original line number Diff line number Diff line
@@ -1208,7 +1208,9 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode) 


SYSCALL_DEFINE3(open, const char __user *, filename, int, flags, umode_t, mode)

{

	return ksys_open(filename, flags, mode);

	if (force_o_largefile())

		flags |= O_LARGEFILE;

	return do_sys_open(AT_FDCWD, filename, flags, mode);

}



SYSCALL_DEFINE4(openat, int, dfd, const char __user *, filename, int, flags,
@@ -1270,9 +1272,12 @@ COMPAT_SYSCALL_DEFINE4(openat, int, dfd, const char __user *, filename, int, fla 
 */

SYSCALL_DEFINE2(creat, const char __user *, pathname, umode_t, mode)

{

	return ksys_open(pathname, O_CREAT | O_WRONLY | O_TRUNC, mode);

}

	int flags = O_CREAT | O_WRONLY | O_TRUNC;



	if (force_o_largefile())

		flags |= O_LARGEFILE;

	return do_sys_open(AT_FDCWD, pathname, flags, mode);

}

#endif



/*

include/linux/syscalls.h

+0 −11
Original line number Diff line number Diff line
@@ -1374,17 +1374,6 @@ static inline int ksys_close(unsigned int fd) 
	return __close_fd(current->files, fd);

}



extern long do_sys_open(int dfd, const char __user *filename, int flags,

			umode_t mode);



static inline long ksys_open(const char __user *filename, int flags,

			     umode_t mode)

{

	if (force_o_largefile())

		flags |= O_LARGEFILE;

	return do_sys_open(AT_FDCWD, filename, flags, mode);

}



extern long do_sys_truncate(const char __user *pathname, loff_t length);



static inline long ksys_truncate(const char __user *pathname, loff_t length)