summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2015-05-12 18:44:32 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2015-05-15 01:10:43 -0400
commit76ae2a5ab13c4413dd403c940c16bd0b1e609346 (patch)
tree8e8c11b00413d9b33d6e8f0a5f8d6de89a759a19 /fs
parentc8a53ee5ee4fcab5ee252f61a69609b65e5e74b8 (diff)
namei: trim do_last() arguments
now that struct filename is stashed in nameidata we have no need to pass it in Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
-rw-r--r--fs/namei.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/namei.c b/fs/namei.c
index 970456fc9ea8..8d453041a323 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2992,7 +2992,7 @@ out_dput:
*/
static int do_last(struct nameidata *nd,
struct file *file, const struct open_flags *op,
- int *opened, struct filename *name)
+ int *opened)
{
struct dentry *dir = nd->path.dentry;
int open_flag = op->open_flag;
@@ -3039,7 +3039,7 @@ static int do_last(struct nameidata *nd,
if (error)
return error;
- audit_inode(name, dir, LOOKUP_PARENT);
+ audit_inode(nd->name, dir, LOOKUP_PARENT);
/* trailing slashes? */
if (unlikely(nd->last.name[nd->last.len]))
return -EISDIR;
@@ -3068,7 +3068,7 @@ retry_lookup:
!S_ISREG(file_inode(file)->i_mode))
will_truncate = false;
- audit_inode(name, file->f_path.dentry, 0);
+ audit_inode(nd->name, file->f_path.dentry, 0);
goto opened;
}
@@ -3085,7 +3085,7 @@ retry_lookup:
* create/update audit record if it already exists.
*/
if (d_is_positive(path.dentry))
- audit_inode(name, path.dentry, 0);
+ audit_inode(nd->name, path.dentry, 0);
/*
* If atomic_open() acquired write access it is dropped now due to
@@ -3143,7 +3143,7 @@ finish_open:
path_put(&save_parent);
return error;
}
- audit_inode(name, nd->path.dentry, 0);
+ audit_inode(nd->name, nd->path.dentry, 0);
error = -EISDIR;
if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry))
goto out;
@@ -3298,7 +3298,7 @@ static struct file *path_openat(struct nameidata *nd,
return ERR_CAST(s);
}
while (!(error = link_path_walk(s, nd)) &&
- (error = do_last(nd, file, op, &opened, nd->name)) > 0) {
+ (error = do_last(nd, file, op, &opened)) > 0) {
nd->flags &= ~(LOOKUP_OPEN|LOOKUP_CREATE|LOOKUP_EXCL);
s = trailing_symlink(nd);
if (IS_ERR(s)) {