git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[GFS2] Fix page_mkwrite truncation race path
[pandora-kernel.git]
/
fs
/
namei.c
diff --git
a/fs/namei.c
b/fs/namei.c
index
1e5c716
..
73e2e66
100644
(file)
--- a/
fs/namei.c
+++ b/
fs/namei.c
@@
-1174,7
+1174,7
@@
static int fastcall do_path_lookup(int dfd, const char *name,
out:
if (unlikely(!retval && !audit_dummy_context() && nd->dentry &&
nd->dentry->d_inode))
out:
if (unlikely(!retval && !audit_dummy_context() && nd->dentry &&
nd->dentry->d_inode))
- audit_inode(name, nd->dentry
->d_inode
);
+ audit_inode(name, nd->dentry);
out_fail:
return retval;
out_fail:
return retval;
@@
-1214,7
+1214,7
@@
int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt,
retval = path_walk(name, nd);
if (unlikely(!retval && !audit_dummy_context() && nd->dentry &&
nd->dentry->d_inode))
retval = path_walk(name, nd);
if (unlikely(!retval && !audit_dummy_context() && nd->dentry &&
nd->dentry->d_inode))
- audit_inode(name, nd->dentry
->d_inode
);
+ audit_inode(name, nd->dentry);
return retval;
return retval;
@@
-1469,7
+1469,7
@@
static int may_delete(struct inode *dir,struct dentry *victim,int isdir)
return -ENOENT;
BUG_ON(victim->d_parent->d_inode != dir);
return -ENOENT;
BUG_ON(victim->d_parent->d_inode != dir);
- audit_inode_child(victim->d_name.name, victim
->d_inode
, dir);
+ audit_inode_child(victim->d_name.name, victim, dir);
error = permission(dir,MAY_WRITE | MAY_EXEC, NULL);
if (error)
error = permission(dir,MAY_WRITE | MAY_EXEC, NULL);
if (error)
@@
-1605,7
+1605,7
@@
int may_open(struct nameidata *nd, int acc_mode, int flag)
if (S_ISLNK(inode->i_mode))
return -ELOOP;
if (S_ISLNK(inode->i_mode))
return -ELOOP;
- if (S_ISDIR(inode->i_mode) && (
flag & FMODE
_WRITE))
+ if (S_ISDIR(inode->i_mode) && (
acc_mode & MAY
_WRITE))
return -EISDIR;
/*
return -EISDIR;
/*
@@
-1620,7
+1620,7
@@
int may_open(struct nameidata *nd, int acc_mode, int flag)
return -EACCES;
flag &= ~O_TRUNC;
return -EACCES;
flag &= ~O_TRUNC;
- } else if (IS_RDONLY(inode) && (
flag & FMODE
_WRITE))
+ } else if (IS_RDONLY(inode) && (
acc_mode & MAY
_WRITE))
return -EROFS;
error = vfs_permission(nd, acc_mode);
return -EROFS;
error = vfs_permission(nd, acc_mode);
@@
-1783,7
+1783,7
@@
do_last:
* It already exists.
*/
mutex_unlock(&dir->d_inode->i_mutex);
* It already exists.
*/
mutex_unlock(&dir->d_inode->i_mutex);
- audit_inode(pathname, path.dentry
->d_inode
);
+ audit_inode(pathname, path.dentry);
error = -EEXIST;
if (flag & O_EXCL)
error = -EEXIST;
if (flag & O_EXCL)
@@
-2562,7
+2562,7
@@
int vfs_rename(struct inode *old_dir, struct dentry *old_dentry,
if (!error) {
const char *new_name = old_dentry->d_name.name;
fsnotify_move(old_dir, new_dir, old_name, new_name, is_dir,
if (!error) {
const char *new_name = old_dentry->d_name.name;
fsnotify_move(old_dir, new_dir, old_name, new_name, is_dir,
- new_dentry->d_inode, old_dentry
->d_inode
);
+ new_dentry->d_inode, old_dentry);
}
fsnotify_oldname_free(old_name);
}
fsnotify_oldname_free(old_name);