Commit cc2a5271155a108c9c6a8d70ec4e4f860f32cd07
1 parent
e97cdc87be
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
lookup_slow: get rid of name argument
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Showing 1 changed file with 3 additions and 4 deletions Side-by-side Diff
fs/namei.c
| ... | ... | @@ -1436,8 +1436,7 @@ |
| 1436 | 1436 | } |
| 1437 | 1437 | |
| 1438 | 1438 | /* Fast lookup failed, do it the slow way */ |
| 1439 | -static int lookup_slow(struct nameidata *nd, struct qstr *name, | |
| 1440 | - struct path *path) | |
| 1439 | +static int lookup_slow(struct nameidata *nd, struct path *path) | |
| 1441 | 1440 | { |
| 1442 | 1441 | struct dentry *dentry, *parent; |
| 1443 | 1442 | int err; |
| ... | ... | @@ -1446,7 +1445,7 @@ |
| 1446 | 1445 | BUG_ON(nd->inode != parent->d_inode); |
| 1447 | 1446 | |
| 1448 | 1447 | mutex_lock(&parent->d_inode->i_mutex); |
| 1449 | - dentry = __lookup_hash(name, parent, nd->flags); | |
| 1448 | + dentry = __lookup_hash(&nd->last, parent, nd->flags); | |
| 1450 | 1449 | mutex_unlock(&parent->d_inode->i_mutex); |
| 1451 | 1450 | if (IS_ERR(dentry)) |
| 1452 | 1451 | return PTR_ERR(dentry); |
| ... | ... | @@ -1535,7 +1534,7 @@ |
| 1535 | 1534 | if (err < 0) |
| 1536 | 1535 | goto out_err; |
| 1537 | 1536 | |
| 1538 | - err = lookup_slow(nd, &nd->last, path); | |
| 1537 | + err = lookup_slow(nd, path); | |
| 1539 | 1538 | if (err < 0) |
| 1540 | 1539 | goto out_err; |
| 1541 | 1540 |