aboutsummaryrefslogtreecommitdiffstats
path: root/fs/compat.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-01-18 20:43:53 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-18 22:20:29 -0500
commit5590ff0d5528b60153c0b4e7b771472b5a95e297 (patch)
tree5fdccf2354269702f71beb8e0a2942e4167fd992 /fs/compat.c
parente2f99018eb7b29954747a2dd78e9fc0c36a60f0f (diff)
[PATCH] vfs: *at functions: core
Here is a series of patches which introduce in total 13 new system calls which take a file descriptor/filename pair instead of a single file name. These functions, openat etc, have been discussed on numerous occasions. They are needed to implement race-free filesystem traversal, they are necessary to implement a virtual per-thread current working directory (think multi-threaded backup software), etc. We have in glibc today implementations of the interfaces which use the /proc/self/fd magic. But this code is rather expensive. Here are some results (similar to what Jim Meyering posted before). The test creates a deep directory hierarchy on a tmpfs filesystem. Then rm -fr is used to remove all directories. Without syscall support I get this: real 0m31.921s user 0m0.688s sys 0m31.234s With syscall support the results are much better: real 0m20.699s user 0m0.536s sys 0m20.149s The interfaces are for obvious reasons currently not much used. But they'll be used. coreutils (and Jeff's posixutils) are already using them. Furthermore, code like ftw/fts in libc (maybe even glob) will also start using them. I expect a patch to make follow soon. Every program which is walking the filesystem tree will benefit. Signed-off-by: Ulrich Drepper <drepper@redhat.com> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Al Viro <viro@ftp.linux.org.uk> Acked-by: Ingo Molnar <mingo@elte.hu> Cc: Michael Kerrisk <mtk-manpages@gmx.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/compat.c')
-rw-r--r--fs/compat.c48
1 files changed, 42 insertions, 6 deletions
diff --git a/fs/compat.c b/fs/compat.c
index 2468ac1df2f0..c6ba9deabada 100644
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -68,10 +68,10 @@ asmlinkage long compat_sys_utime(char __user *filename, struct compat_utimbuf __
68 tv[0].tv_usec = 0; 68 tv[0].tv_usec = 0;
69 tv[1].tv_usec = 0; 69 tv[1].tv_usec = 0;
70 } 70 }
71 return do_utimes(filename, t ? tv : NULL); 71 return do_utimes(AT_FDCWD, filename, t ? tv : NULL);
72} 72}
73 73
74asmlinkage long compat_sys_utimes(char __user *filename, struct compat_timeval __user *t) 74asmlinkage long compat_sys_futimesat(int dfd, char __user *filename, struct compat_timeval __user *t)
75{ 75{
76 struct timeval tv[2]; 76 struct timeval tv[2];
77 77
@@ -82,14 +82,19 @@ asmlinkage long compat_sys_utimes(char __user *filename, struct compat_timeval _
82 get_user(tv[1].tv_usec, &t[1].tv_usec)) 82 get_user(tv[1].tv_usec, &t[1].tv_usec))
83 return -EFAULT; 83 return -EFAULT;
84 } 84 }
85 return do_utimes(filename, t ? tv : NULL); 85 return do_utimes(dfd, filename, t ? tv : NULL);
86}
87
88asmlinkage long compat_sys_utimes(char __user *filename, struct compat_timeval __user *t)
89{
90 return compat_sys_futimesat(AT_FDCWD, filename, t);
86} 91}
87 92
88asmlinkage long compat_sys_newstat(char __user * filename, 93asmlinkage long compat_sys_newstat(char __user * filename,
89 struct compat_stat __user *statbuf) 94 struct compat_stat __user *statbuf)
90{ 95{
91 struct kstat stat; 96 struct kstat stat;
92 int error = vfs_stat(filename, &stat); 97 int error = vfs_stat_fd(AT_FDCWD, filename, &stat);
93 98
94 if (!error) 99 if (!error)
95 error = cp_compat_stat(&stat, statbuf); 100 error = cp_compat_stat(&stat, statbuf);
@@ -100,13 +105,34 @@ asmlinkage long compat_sys_newlstat(char __user * filename,
100 struct compat_stat __user *statbuf) 105 struct compat_stat __user *statbuf)
101{ 106{
102 struct kstat stat; 107 struct kstat stat;
103 int error = vfs_lstat(filename, &stat); 108 int error = vfs_lstat_fd(AT_FDCWD, filename, &stat);
104 109
105 if (!error) 110 if (!error)
106 error = cp_compat_stat(&stat, statbuf); 111 error = cp_compat_stat(&stat, statbuf);
107 return error; 112 return error;
108} 113}
109 114
115asmlinkage long compat_sys_newfstatat(int dfd, char __user *filename,
116 struct compat_stat __user *statbuf, int flag)
117{
118 struct kstat stat;
119 int error = -EINVAL;
120
121 if ((flag & ~AT_SYMLINK_NOFOLLOW) != 0)
122 goto out;
123
124 if (flag & AT_SYMLINK_NOFOLLOW)
125 error = vfs_lstat_fd(dfd, filename, &stat);
126 else
127 error = vfs_stat_fd(dfd, filename, &stat);
128
129 if (!error)
130 error = cp_compat_stat(&stat, statbuf);
131
132out:
133 return error;
134}
135
110asmlinkage long compat_sys_newfstat(unsigned int fd, 136asmlinkage long compat_sys_newfstat(unsigned int fd,
111 struct compat_stat __user * statbuf) 137 struct compat_stat __user * statbuf)
112{ 138{
@@ -1290,7 +1316,17 @@ out:
1290asmlinkage long 1316asmlinkage long
1291compat_sys_open(const char __user *filename, int flags, int mode) 1317compat_sys_open(const char __user *filename, int flags, int mode)
1292{ 1318{
1293 return do_sys_open(filename, flags, mode); 1319 return do_sys_open(AT_FDCWD, filename, flags, mode);
1320}
1321
1322/*
1323 * Exactly like fs/open.c:sys_openat(), except that it doesn't set the
1324 * O_LARGEFILE flag.
1325 */
1326asmlinkage long
1327compat_sys_openat(int dfd, const char __user *filename, int flags, int mode)
1328{
1329 return do_sys_open(dfd, filename, flags, mode);
1294} 1330}
1295 1331
1296/* 1332/*