projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] dio: centralize completion in dio_complete()
[powerpc.git]
/
fs
/
namei.c
diff --git
a/fs/namei.c
b/fs/namei.c
index
db1bca2
..
e4f108f
100644
(file)
--- a/
fs/namei.c
+++ b/
fs/namei.c
@@
-297,7
+297,7
@@
int vfs_permission(struct nameidata *nd, int mask)
*/
int file_permission(struct file *file, int mask)
{
*/
int file_permission(struct file *file, int mask)
{
- return permission(file->f_dentry->d_inode, mask, NULL);
+ return permission(file->f_
path.
dentry->d_inode, mask, NULL);
}
/*
}
/*
@@
-333,7
+333,7
@@
int get_write_access(struct inode * inode)
int deny_write_access(struct file * file)
{
int deny_write_access(struct file * file)
{
- struct inode *inode = file->f_dentry->d_inode;
+ struct inode *inode = file->f_
path.
dentry->d_inode;
spin_lock(&inode->i_lock);
if (atomic_read(&inode->i_writecount) > 0) {
spin_lock(&inode->i_lock);
if (atomic_read(&inode->i_writecount) > 0) {
@@
-368,7
+368,7
@@
void path_release_on_umount(struct nameidata *nd)
*/
void release_open_intent(struct nameidata *nd)
{
*/
void release_open_intent(struct nameidata *nd)
{
- if (nd->intent.open.file->f_dentry == NULL)
+ if (nd->intent.open.file->f_
path.
dentry == NULL)
put_filp(nd->intent.open.file);
else
fput(nd->intent.open.file);
put_filp(nd->intent.open.file);
else
fput(nd->intent.open.file);
@@
-572,11
+572,6
@@
fail:
return PTR_ERR(link);
}
return PTR_ERR(link);
}
-struct path {
- struct vfsmount *mnt;
- struct dentry *dentry;
-};
-
static inline void dput_path(struct path *path, struct nameidata *nd)
{
dput(path->dentry);
static inline void dput_path(struct path *path, struct nameidata *nd)
{
dput(path->dentry);
@@
-1143,7
+1138,7
@@
static int fastcall do_path_lookup(int dfd, const char *name,
if (!file)
goto out_fail;
if (!file)
goto out_fail;
- dentry = file->f_dentry;
+ dentry = file->f_
path.
dentry;
retval = -ENOTDIR;
if (!S_ISDIR(dentry->d_inode->i_mode))
retval = -ENOTDIR;
if (!S_ISDIR(dentry->d_inode->i_mode))
@@
-1153,7
+1148,7
@@
static int fastcall do_path_lookup(int dfd, const char *name,
if (retval)
goto fput_fail;
if (retval)
goto fput_fail;
- nd->mnt = mntget(file->f_
vfs
mnt);
+ nd->mnt = mntget(file->f_
path.
mnt);
nd->dentry = dget(dentry);
fput_light(file, fput_needed);
nd->dentry = dget(dentry);
fput_light(file, fput_needed);