projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm
[cascardo/linux.git]
/
fs
/
stat.c
diff --git
a/fs/stat.c
b/fs/stat.c
index
38a8cb2
..
9cf41f7
100644
(file)
--- a/
fs/stat.c
+++ b/
fs/stat.c
@@
-8,7
+8,6
@@
#include <linux/mm.h>
#include <linux/errno.h>
#include <linux/file.h>
#include <linux/mm.h>
#include <linux/errno.h>
#include <linux/file.h>
-#include <linux/smp_lock.h>
#include <linux/highuid.h>
#include <linux/fs.h>
#include <linux/namei.h>
#include <linux/highuid.h>
#include <linux/fs.h>
#include <linux/namei.h>
@@
-63,8
+62,8
@@
int vfs_stat_fd(int dfd, char __user *name, struct kstat *stat)
error = __user_walk_fd(dfd, name, LOOKUP_FOLLOW, &nd);
if (!error) {
error = __user_walk_fd(dfd, name, LOOKUP_FOLLOW, &nd);
if (!error) {
- error = vfs_getattr(nd.
mnt, nd
.dentry, stat);
- path_
release(&nd
);
+ error = vfs_getattr(nd.
path.mnt, nd.path
.dentry, stat);
+ path_
put(&nd.path
);
}
return error;
}
}
return error;
}
@@
-83,8
+82,8
@@
int vfs_lstat_fd(int dfd, char __user *name, struct kstat *stat)
error = __user_walk_fd(dfd, name, 0, &nd);
if (!error) {
error = __user_walk_fd(dfd, name, 0, &nd);
if (!error) {
- error = vfs_getattr(nd.
mnt, nd
.dentry, stat);
- path_
release(&nd
);
+ error = vfs_getattr(nd.
path.mnt, nd.path
.dentry, stat);
+ path_
put(&nd.path
);
}
return error;
}
}
return error;
}
@@
-303,17
+302,18
@@
asmlinkage long sys_readlinkat(int dfd, const char __user *path,
error = __user_walk_fd(dfd, path, 0, &nd);
if (!error) {
error = __user_walk_fd(dfd, path, 0, &nd);
if (!error) {
- struct inode *
inode = nd
.dentry->d_inode;
+ struct inode *
inode = nd.path
.dentry->d_inode;
error = -EINVAL;
if (inode->i_op && inode->i_op->readlink) {
error = -EINVAL;
if (inode->i_op && inode->i_op->readlink) {
- error = security_inode_readlink(nd.dentry);
+ error = security_inode_readlink(nd.
path.
dentry);
if (!error) {
if (!error) {
- touch_atime(nd.mnt, nd.dentry);
- error = inode->i_op->readlink(nd.dentry, buf, bufsiz);
+ touch_atime(nd.path.mnt, nd.path.dentry);
+ error = inode->i_op->readlink(nd.path.dentry,
+ buf, bufsiz);
}
}
}
}
- path_
release(&nd
);
+ path_
put(&nd.path
);
}
return error;
}
}
return error;
}