diff options
Diffstat (limited to 'fs/namespace.c')
| -rw-r--r-- | fs/namespace.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index a40685d800a8..228d8c4bfd18 100644 --- a/fs/namespace.c +++ b/fs/namespace.c | |||
| @@ -1128,7 +1128,7 @@ static int do_umount(struct vfsmount *mnt, int flags) | |||
| 1128 | * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD | 1128 | * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD |
| 1129 | */ | 1129 | */ |
| 1130 | 1130 | ||
| 1131 | asmlinkage long sys_umount(char __user * name, int flags) | 1131 | SYSCALL_DEFINE2(umount, char __user *, name, int, flags) |
| 1132 | { | 1132 | { |
| 1133 | struct path path; | 1133 | struct path path; |
| 1134 | int retval; | 1134 | int retval; |
| @@ -1160,7 +1160,7 @@ out: | |||
| 1160 | /* | 1160 | /* |
| 1161 | * The 2.0 compatible umount. No flags. | 1161 | * The 2.0 compatible umount. No flags. |
| 1162 | */ | 1162 | */ |
| 1163 | asmlinkage long sys_oldumount(char __user * name) | 1163 | SYSCALL_DEFINE1(oldumount, char __user *, name) |
| 1164 | { | 1164 | { |
| 1165 | return sys_umount(name, 0); | 1165 | return sys_umount(name, 0); |
| 1166 | } | 1166 | } |
| @@ -2045,9 +2045,8 @@ struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns, | |||
| 2045 | return new_ns; | 2045 | return new_ns; |
| 2046 | } | 2046 | } |
| 2047 | 2047 | ||
| 2048 | asmlinkage long sys_mount(char __user * dev_name, char __user * dir_name, | 2048 | SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name, |
| 2049 | char __user * type, unsigned long flags, | 2049 | char __user *, type, unsigned long, flags, void __user *, data) |
| 2050 | void __user * data) | ||
| 2051 | { | 2050 | { |
| 2052 | int retval; | 2051 | int retval; |
| 2053 | unsigned long data_page; | 2052 | unsigned long data_page; |
| @@ -2172,8 +2171,8 @@ static void chroot_fs_refs(struct path *old_root, struct path *new_root) | |||
| 2172 | * though, so you may need to say mount --bind /nfs/my_root /nfs/my_root | 2171 | * though, so you may need to say mount --bind /nfs/my_root /nfs/my_root |
| 2173 | * first. | 2172 | * first. |
| 2174 | */ | 2173 | */ |
| 2175 | asmlinkage long sys_pivot_root(const char __user * new_root, | 2174 | SYSCALL_DEFINE2(pivot_root, const char __user *, new_root, |
| 2176 | const char __user * put_old) | 2175 | const char __user *, put_old) |
| 2177 | { | 2176 | { |
| 2178 | struct vfsmount *tmp; | 2177 | struct vfsmount *tmp; |
| 2179 | struct path new, old, parent_path, root_parent, root; | 2178 | struct path new, old, parent_path, root_parent, root; |
