diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-10 07:51:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-10 20:21:46 -0700 |
| commit | 8387ff2577eb9ed245df9a39947f66976c6bcd02 (patch) | |
| tree | 79fafcb5777f16e520d1c39e9389039f866b4c6d /fs/jffs2/write.c | |
| parent | 147d9e7bcad3b8d5465f6eea6292731e7f35dee8 (diff) | |
| download | linux-8387ff2577eb9ed245df9a39947f66976c6bcd02.tar.gz linux-8387ff2577eb9ed245df9a39947f66976c6bcd02.tar.bz2 linux-8387ff2577eb9ed245df9a39947f66976c6bcd02.zip | |
vfs: make the string hashes salt the hash
We always mixed in the parent pointer into the dentry name hash, but we
did it late at lookup time. It turns out that we can simplify that
lookup-time action by salting the hash with the parent pointer early
instead of late.
A few other users of our string hashes also wanted to mix in their own
pointers into the hash, and those are updated to use the same mechanism.
Hash users that don't have any particular initial salt can just use the
NULL pointer as a no-salt.
Cc: Vegard Nossum <vegard.nossum@oracle.com>
Cc: George Spelvin <linux@sciencehorizons.net>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/jffs2/write.c')
| -rw-r--r-- | fs/jffs2/write.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jffs2/write.c b/fs/jffs2/write.c index 7fb187ab2682..cda9a361368e 100644 --- a/fs/jffs2/write.c +++ b/fs/jffs2/write.c @@ -245,7 +245,7 @@ struct jffs2_full_dirent *jffs2_write_dirent(struct jffs2_sb_info *c, struct jff fd->version = je32_to_cpu(rd->version); fd->ino = je32_to_cpu(rd->ino); - fd->nhash = full_name_hash(name, namelen); + fd->nhash = full_name_hash(NULL, name, namelen); fd->type = rd->type; memcpy(fd->name, name, namelen); fd->name[namelen]=0; @@ -598,7 +598,7 @@ int jffs2_do_unlink(struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, jffs2_add_fd_to_list(c, fd, &dir_f->dents); mutex_unlock(&dir_f->sem); } else { - uint32_t nhash = full_name_hash(name, namelen); + uint32_t nhash = full_name_hash(NULL, name, namelen); fd = dir_f->dents; /* We don't actually want to reserve any space, but we do |