projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[deliverable/linux.git]
/
fs
/
jffs2
/
write.c
diff --git
a/fs/jffs2/write.c
b/fs/jffs2/write.c
index 7fb187ab2682ff3433f7f26eebb68dd5e8ad9e21..cda9a361368e8e2c9949e577718691e931bd06bd 100644
(file)
--- 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->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;
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 {
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
fd = dir_f->dents;
/* We don't actually want to reserve any space, but we do
This page took
0.02495 seconds
and
5
git commands to generate.