lkml.org 
[lkml]   [2015]   [May]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 17/21] namei: trim do_last() arguments
Date
From: Al Viro <viro@zeniv.linux.org.uk>

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>
---
fs/namei.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index 0c39113..9259fa9 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -2990,7 +2990,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;
@@ -3037,7 +3037,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;
@@ -3066,7 +3066,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;
}

@@ -3083,7 +3083,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
@@ -3141,7 +3141,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;
@@ -3296,7 +3296,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)) {
--
2.1.4


\
 
 \ /
  Last update: 2015-05-14 00:41    [W:0.329 / U:5.240 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site