Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 234261
b: refs/heads/master
c: 5a202bc
h: refs/heads/master
i:
  234259: 3f2d6ae
v: v3
  • Loading branch information
Al Viro committed Mar 14, 2011
1 parent 7d78f80 commit 163e3be
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 24 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6a96ba54418be740303765c0f52be028573cb99a
refs/heads/master: 5a202bcd75bbd2397136397961babbd8463416af
42 changes: 19 additions & 23 deletions trunk/fs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -1216,16 +1216,6 @@ static int do_lookup(struct nameidata *nd, struct qstr *name,
struct inode *dir;
int err;

/*
* See if the low-level filesystem might want
* to use its own hash..
*/
if (unlikely(parent->d_flags & DCACHE_OP_HASH)) {
err = parent->d_op->d_hash(parent, nd->inode, name);
if (err < 0)
return err;
}

/*
* Rename seqlock is not required here because in the off chance
* of a false negative due to a concurrent rename, we're going to
Expand Down Expand Up @@ -1414,8 +1404,16 @@ static int link_path_walk(const char *name, struct nameidata *nd)
case 1:
type = LAST_DOT;
}
if (likely(type == LAST_NORM))
if (likely(type == LAST_NORM)) {
struct dentry *parent = nd->path.dentry;
nd->flags &= ~LOOKUP_JUMPED;
if (unlikely(parent->d_flags & DCACHE_OP_HASH)) {
err = parent->d_op->d_hash(parent, nd->inode,
&this);
if (err < 0)
break;
}
}

/* remove trailing slashes? */
if (!c)
Expand Down Expand Up @@ -1722,17 +1720,6 @@ static struct dentry *__lookup_hash(struct qstr *name,
if (err)
return ERR_PTR(err);

/*
* See if the low-level filesystem might want
* to use its own hash..
*/
if (base->d_flags & DCACHE_OP_HASH) {
err = base->d_op->d_hash(base, inode, name);
dentry = ERR_PTR(err);
if (err < 0)
goto out;
}

/*
* Don't bother with __d_lookup: callers are for creat as
* well as unlink, so a lot of the time it would cost
Expand All @@ -1745,7 +1732,7 @@ static struct dentry *__lookup_hash(struct qstr *name,

if (!dentry)
dentry = d_alloc_and_lookup(base, name, nd);
out:

return dentry;
}

Expand Down Expand Up @@ -1791,6 +1778,15 @@ struct dentry *lookup_one_len(const char *name, struct dentry *base, int len)
hash = partial_name_hash(c, hash);
}
this.hash = end_name_hash(hash);
/*
* See if the low-level filesystem might want
* to use its own hash..
*/
if (base->d_flags & DCACHE_OP_HASH) {
int err = base->d_op->d_hash(base, base->d_inode, &this);
if (err < 0)
return ERR_PTR(err);
}

return __lookup_hash(&this, base, NULL);
}
Expand Down

0 comments on commit 163e3be

Please sign in to comment.