Switch open_exec() and sys_uselib() to do_open_filp()

[safe/jmp/linux-2.6] / fs / open.c

diff --git a/fs/open.c b/fs/open.c
index bc49e3c..bdfbf03 100644 (file)
--- a/fs/open.c
+++ b/fs/open.c
@@ -29,6 +29,7 @@
 #include <linux/rcupdate.h>
 #include <linux/audit.h>
 #include <linux/falloc.h>
+#include <linux/fs_struct.h>
 
 int vfs_statfs(struct dentry *dentry, struct kstatfs *buf)
 {
@@ -273,7 +274,7 @@ static long do_sys_truncate(const char __user *pathname, loff_t length)
        if (!error)
                error = security_path_truncate(&path, length, 0);
        if (!error) {
-               DQUOT_INIT(inode);
+               vfs_dq_init(inode);
                error = do_truncate(path.dentry, length, 0, NULL);
        }
 
@@ -447,7 +448,7 @@ SYSCALL_ALIAS(sys_fallocate, SyS_fallocate);
  * We do this by temporarily clearing all FS-related capabilities and
  * switching the fsuid/fsgid around to the real ones.
  */
-asmlinkage long sys_faccessat(int dfd, const char __user *filename, int mode)
+SYSCALL_DEFINE3(faccessat, int, dfd, const char __user *, filename, int, mode)
 {
        const struct cred *old_cred;
        struct cred *override_cred;
@@ -628,8 +629,7 @@ out:
        return err;
 }
 
-asmlinkage long sys_fchmodat(int dfd, const char __user *filename,
-                            mode_t mode)
+SYSCALL_DEFINE3(fchmodat, int, dfd, const char __user *, filename, mode_t, mode)
 {
        struct path path;
        struct inode *inode;
@@ -707,8 +707,8 @@ out:
        return error;
 }
 
-asmlinkage long sys_fchownat(int dfd, const char __user *filename, uid_t user,
-                            gid_t group, int flag)
+SYSCALL_DEFINE5(fchownat, int, dfd, const char __user *, filename, uid_t, user,
+               gid_t, group, int, flag)
 {
        struct path path;
        int error = -EINVAL;
@@ -1033,7 +1033,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, int mode)
        if (!IS_ERR(tmp)) {
                fd = get_unused_fd_flags(flags);
                if (fd >= 0) {
-                       struct file *f = do_filp_open(dfd, tmp, flags, mode);
+                       struct file *f = do_filp_open(dfd, tmp, flags, mode, 0);
                        if (IS_ERR(f)) {
                                put_unused_fd(fd);
                                fd = PTR_ERR(f);
@@ -1060,8 +1060,8 @@ SYSCALL_DEFINE3(open, const char __user *, filename, int, flags, int, mode)
        return ret;
 }
 
-asmlinkage long sys_openat(int dfd, const char __user *filename, int flags,
-                          int mode)
+SYSCALL_DEFINE4(openat, int, dfd, const char __user *, filename, int, flags,
+               int, mode)
 {
        long ret;