[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, 27 deletions

diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86_64/ia32/ia32entry.S
index c45d6a05b984..f174083d5567 100644
--- a/arch/x86_64/ia32/ia32entry.S
+++ b/arch/x86_64/ia32/ia32entry.S
@@ -307,7 +307,7 @@ ia32_sys_call_table:
         .quad stub32_fork
         .quad sys_read
         .quad sys_write
-        .quad sys32_open                /* 5 */
+        .quad compat_sys_open           /* 5 */
         .quad sys_close
         .quad sys32_waitpid
         .quad sys_creat
diff --git a/arch/x86_64/ia32/sys_ia32.c b/arch/x86_64/ia32/sys_ia32.c
index be996d1b691e..04d80406ce4f 100644
--- a/arch/x86_64/ia32/sys_ia32.c
+++ b/arch/x86_64/ia32/sys_ia32.c
@@ -969,32 +969,6 @@ long sys32_kill(int pid, int sig)
         return sys_kill(pid, sig);
 }
  
-asmlinkage long sys32_open(const char __user * filename, int flags, int mode)
-{
-        char * tmp;
-        int fd, error;
-
-        /* don't force O_LARGEFILE */
-        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)) {
-                                put_unused_fd(fd); 
-                                fd = error;
-                        } else {
-                                fsnotify_open(f->f_dentry);
-                                fd_install(fd, f);
-                        }
-                }
-                putname(tmp);
-        }
-        return fd;
-}
-
 extern asmlinkage long
 sys_timer_create(clockid_t which_clock,
                  struct sigevent __user *timer_event_spec,