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

Commit e922efc3 authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Linus Torvalds
Browse files

[PATCH] remove duplicated sys_open32() code from 64bit archs 



64 bit architectures all implement their own compatibility sys_open(),
when in fact the difference is simply not forcing the O_LARGEFILE
flag.  So use the a common function instead.

Signed-off-by: default avatarMiklos Szeredi <miklos@szeredi.hu>
Cc: <viro@parcelfarce.linux.theplanet.co.uk>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ab8d11be

arch/ia64/ia32/ia32_entry.S

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ ia32_syscall_table: 
	data8 sys32_fork

	data8 sys_read

	data8 sys_write

	data8 sys32_open	  /* 5 */

	data8 compat_sys_open	  /* 5 */

	data8 sys_close

	data8 sys32_waitpid

	data8 sys_creat

arch/ia64/ia32/sys_ia32.c

+0 −31
Original line number Diff line number Diff line
@@ -2359,37 +2359,6 @@ sys32_brk (unsigned int brk) 
	return ret;

}



/*

 * Exactly like fs/open.c:sys_open(), except that it doesn't set the O_LARGEFILE flag.

 */

asmlinkage long

sys32_open (const char __user * filename, int flags, int mode)

{

	char * tmp;

	int fd, error;



	tmp = getname(filename);

	fd = PTR_ERR(tmp);

	if (!IS_ERR(tmp)) {

		fd = get_unused_fd();

		if (fd >= 0) {

			struct file *f = filp_open(tmp, flags, mode);

			error = PTR_ERR(f);

			if (IS_ERR(f))

				goto out_error;

			fd_install(fd, f);

		}

out:

		putname(tmp);

	}

	return fd;



out_error:

	put_unused_fd(fd);

	fd = error;

	goto out;

}



/* Structure for ia32 emulation on ia64 */

struct epoll_event32

{

arch/ppc64/kernel/misc.S

+1 −1
Original line number Diff line number Diff line
@@ -957,7 +957,7 @@ _GLOBAL(sys_call_table32) 
	.llong .ppc_fork

	.llong .sys_read

	.llong .sys_write

	.llong .sys32_open		/* 5 */

	.llong .compat_sys_open		/* 5 */

	.llong .sys_close

	.llong .sys32_waitpid

	.llong .sys32_creat

arch/ppc64/kernel/sys_ppc32.c

+0 −31
Original line number Diff line number Diff line
@@ -867,37 +867,6 @@ off_t ppc32_lseek(unsigned int fd, u32 offset, unsigned int origin) 
	return sys_lseek(fd, (int)offset, origin);

}



/*

 * This is just a version for 32-bit applications which does

 * not force O_LARGEFILE on.

 */

asmlinkage long sys32_open(const char __user * filename, int flags, int mode)

{

	char * tmp;

	int fd, error;



	tmp = getname(filename);

	fd = PTR_ERR(tmp);

	if (!IS_ERR(tmp)) {

		fd = get_unused_fd();

		if (fd >= 0) {

			struct file * f = filp_open(tmp, flags, mode);

			error = PTR_ERR(f);

			if (IS_ERR(f))

				goto out_error;

			fd_install(fd, f);

		}

out:

		putname(tmp);

	}

	return fd;



out_error:

	put_unused_fd(fd);

	fd = error;

	goto out;

}



/* Note: it is necessary to treat bufsiz as an unsigned int,

 * with the corresponding cast to a signed int to insure that the 

 * proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)

arch/sparc64/kernel/sys_sparc32.c

+1 −23
Original line number Diff line number Diff line
@@ -1002,29 +1002,7 @@ asmlinkage long sys32_adjtimex(struct timex32 __user *utp) 
asmlinkage long sparc32_open(const char __user *filename,

			     int flags, int mode)

{

	char * tmp;

	int fd, error;



	tmp = getname(filename);

	fd = PTR_ERR(tmp);

	if (!IS_ERR(tmp)) {

		fd = get_unused_fd();

		if (fd >= 0) {

			struct file * f = filp_open(tmp, flags, mode);

			error = PTR_ERR(f);

			if (IS_ERR(f))

				goto out_error;

			fd_install(fd, f);

		}

out:

		putname(tmp);

	}

	return fd;



out_error:

	put_unused_fd(fd);

	fd = error;

	goto out;

	return do_sys_open(filename, flags, mode);

}



extern unsigned long do_mremap(unsigned long addr,