projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'core/debugobjects' into core/urgent
[deliverable/linux.git]
/
fs
/
stat.c
diff --git
a/fs/stat.c
b/fs/stat.c
index 7c46fbeb8b762e0f125a594a6fd27747ff160c55..2db740a0cfb5ab1b1cf9b1bf553d2957484b02e7 100644
(file)
--- a/
fs/stat.c
+++ b/
fs/stat.c
@@
-152,7
+152,7
@@
static int cp_old_stat(struct kstat *stat, struct __old_kernel_stat __user * sta
return copy_to_user(statbuf,&tmp,sizeof(tmp)) ? -EFAULT : 0;
}
return copy_to_user(statbuf,&tmp,sizeof(tmp)) ? -EFAULT : 0;
}
-
asmlinkage long sys_stat(char __user * filename, struct __old_kernel_stat __user *
statbuf)
+
SYSCALL_DEFINE2(stat, char __user *, filename, struct __old_kernel_stat __user *,
statbuf)
{
struct kstat stat;
int error = vfs_stat_fd(AT_FDCWD, filename, &stat);
{
struct kstat stat;
int error = vfs_stat_fd(AT_FDCWD, filename, &stat);
@@
-162,7
+162,8
@@
asmlinkage long sys_stat(char __user * filename, struct __old_kernel_stat __user
return error;
}
return error;
}
-asmlinkage long sys_lstat(char __user * filename, struct __old_kernel_stat __user * statbuf)
+
+SYSCALL_DEFINE2(lstat, char __user *, filename, struct __old_kernel_stat __user *, statbuf)
{
struct kstat stat;
int error = vfs_lstat_fd(AT_FDCWD, filename, &stat);
{
struct kstat stat;
int error = vfs_lstat_fd(AT_FDCWD, filename, &stat);
@@
-172,7
+173,8
@@
asmlinkage long sys_lstat(char __user * filename, struct __old_kernel_stat __use
return error;
}
return error;
}
-asmlinkage long sys_fstat(unsigned int fd, struct __old_kernel_stat __user * statbuf)
+
+SYSCALL_DEFINE2(fstat, unsigned int, fd, struct __old_kernel_stat __user *, statbuf)
{
struct kstat stat;
int error = vfs_fstat(fd, &stat);
{
struct kstat stat;
int error = vfs_fstat(fd, &stat);
@@
-235,7
+237,7
@@
static int cp_new_stat(struct kstat *stat, struct stat __user *statbuf)
return copy_to_user(statbuf,&tmp,sizeof(tmp)) ? -EFAULT : 0;
}
return copy_to_user(statbuf,&tmp,sizeof(tmp)) ? -EFAULT : 0;
}
-
asmlinkage long sys_newstat(char __user *filename, struct stat __user *
statbuf)
+
SYSCALL_DEFINE2(newstat, char __user *, filename, struct stat __user *,
statbuf)
{
struct kstat stat;
int error = vfs_stat_fd(AT_FDCWD, filename, &stat);
{
struct kstat stat;
int error = vfs_stat_fd(AT_FDCWD, filename, &stat);
@@
-246,7
+248,7
@@
asmlinkage long sys_newstat(char __user *filename, struct stat __user *statbuf)
return error;
}
return error;
}
-
asmlinkage long sys_newlstat(char __user *filename, struct stat __user *
statbuf)
+
SYSCALL_DEFINE2(newlstat, char __user *, filename, struct stat __user *,
statbuf)
{
struct kstat stat;
int error = vfs_lstat_fd(AT_FDCWD, filename, &stat);
{
struct kstat stat;
int error = vfs_lstat_fd(AT_FDCWD, filename, &stat);
@@
-258,8
+260,8
@@
asmlinkage long sys_newlstat(char __user *filename, struct stat __user *statbuf)
}
#if !defined(__ARCH_WANT_STAT64) || defined(__ARCH_WANT_SYS_NEWFSTATAT)
}
#if !defined(__ARCH_WANT_STAT64) || defined(__ARCH_WANT_SYS_NEWFSTATAT)
-
asmlinkage long sys_newfstatat(int dfd, char __user *
filename,
-
struct stat __user *statbuf, int
flag)
+
SYSCALL_DEFINE4(newfstatat, int, dfd, char __user *,
filename,
+
struct stat __user *, statbuf, int,
flag)
{
struct kstat stat;
int error = -EINVAL;
{
struct kstat stat;
int error = -EINVAL;
@@
-280,7
+282,7
@@
out:
}
#endif
}
#endif
-
asmlinkage long sys_newfstat(unsigned int fd, struct stat __user *
statbuf)
+
SYSCALL_DEFINE2(newfstat, unsigned int, fd, struct stat __user *,
statbuf)
{
struct kstat stat;
int error = vfs_fstat(fd, &stat);
{
struct kstat stat;
int error = vfs_fstat(fd, &stat);
@@
-291,8
+293,8
@@
asmlinkage long sys_newfstat(unsigned int fd, struct stat __user *statbuf)
return error;
}
return error;
}
-
asmlinkage long sys_readlinkat(int dfd, const char __user *
pathname,
-
char __user *buf, int
bufsiz)
+
SYSCALL_DEFINE4(readlinkat, int, dfd, const char __user *,
pathname,
+
char __user *, buf, int,
bufsiz)
{
struct path path;
int error;
{
struct path path;
int error;
@@
-305,7
+307,7
@@
asmlinkage long sys_readlinkat(int dfd, const char __user *pathname,
struct inode *inode = path.dentry->d_inode;
error = -EINVAL;
struct inode *inode = path.dentry->d_inode;
error = -EINVAL;
- if (inode->i_op
&& inode->i_op
->readlink) {
+ if (inode->i_op->readlink) {
error = security_inode_readlink(path.dentry);
if (!error) {
touch_atime(path.mnt, path.dentry);
error = security_inode_readlink(path.dentry);
if (!error) {
touch_atime(path.mnt, path.dentry);
@@
-318,8
+320,8
@@
asmlinkage long sys_readlinkat(int dfd, const char __user *pathname,
return error;
}
return error;
}
-
asmlinkage long sys_readlink(const char __user *path, char __user *
buf,
-
int
bufsiz)
+
SYSCALL_DEFINE3(readlink, const char __user *, path, char __user *,
buf,
+
int,
bufsiz)
{
return sys_readlinkat(AT_FDCWD, path, buf, bufsiz);
}
{
return sys_readlinkat(AT_FDCWD, path, buf, bufsiz);
}
@@
-365,7
+367,7
@@
static long cp_new_stat64(struct kstat *stat, struct stat64 __user *statbuf)
return copy_to_user(statbuf,&tmp,sizeof(tmp)) ? -EFAULT : 0;
}
return copy_to_user(statbuf,&tmp,sizeof(tmp)) ? -EFAULT : 0;
}
-
asmlinkage long sys_stat64(char __user * filename, struct stat64 __user *
statbuf)
+
SYSCALL_DEFINE2(stat64, char __user *, filename, struct stat64 __user *,
statbuf)
{
struct kstat stat;
int error = vfs_stat(filename, &stat);
{
struct kstat stat;
int error = vfs_stat(filename, &stat);
@@
-375,7
+377,8
@@
asmlinkage long sys_stat64(char __user * filename, struct stat64 __user * statbu
return error;
}
return error;
}
-asmlinkage long sys_lstat64(char __user * filename, struct stat64 __user * statbuf)
+
+SYSCALL_DEFINE2(lstat64, char __user *, filename, struct stat64 __user *, statbuf)
{
struct kstat stat;
int error = vfs_lstat(filename, &stat);
{
struct kstat stat;
int error = vfs_lstat(filename, &stat);
@@
-385,7
+388,8
@@
asmlinkage long sys_lstat64(char __user * filename, struct stat64 __user * statb
return error;
}
return error;
}
-asmlinkage long sys_fstat64(unsigned long fd, struct stat64 __user * statbuf)
+
+SYSCALL_DEFINE2(fstat64, unsigned long, fd, struct stat64 __user *, statbuf)
{
struct kstat stat;
int error = vfs_fstat(fd, &stat);
{
struct kstat stat;
int error = vfs_fstat(fd, &stat);
@@
-396,8
+400,8
@@
asmlinkage long sys_fstat64(unsigned long fd, struct stat64 __user * statbuf)
return error;
}
return error;
}
-
asmlinkage long sys_fstatat64(int dfd, char __user *
filename,
-
struct stat64 __user *statbuf, int
flag)
+
SYSCALL_DEFINE4(fstatat64, int, dfd, char __user *,
filename,
+
struct stat64 __user *, statbuf, int,
flag)
{
struct kstat stat;
int error = -EINVAL;
{
struct kstat stat;
int error = -EINVAL;
This page took
0.026616 seconds
and
5
git commands to generate.