[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: Miklos Szeredi <miklos@szeredi.hu>
Cc: <viro@parcelfarce.linux.theplanet.co.uk>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 1 insertions, 32 deletions

diff --git a/arch/ia64/ia32/ia32_entry.S b/arch/ia64/ia32/ia32_entry.S
index 829a6d80711c..0708edb06cc4 100644
--- a/arch/ia64/ia32/ia32_entry.S
+++ b/arch/ia64/ia32/ia32_entry.S
@@ -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
diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c
index c1e20d65dd6c..e29a8a55486a 100644
--- a/arch/ia64/ia32/sys_ia32.c
+++ b/arch/ia64/ia32/sys_ia32.c
@@ -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
 {