diff --git a/[refs] b/[refs] index a4ceef90a520..3099b800fafe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8ca646abb4503f39a7d235b89b9f8015e3ab4631 +refs/heads/master: bf66737ca85c41442e99c9d380eb7807d88bac1f diff --git a/trunk/fs/jffs2/write.c b/trunk/fs/jffs2/write.c index 776f13cbf2b5..beade550909c 100644 --- a/trunk/fs/jffs2/write.c +++ b/trunk/fs/jffs2/write.c @@ -582,9 +582,9 @@ 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); up(&dir_f->sem); } else { - struct jffs2_full_dirent *fd = dir_f->dents; uint32_t nhash = full_name_hash(name, namelen); + fd = dir_f->dents; /* We don't actually want to reserve any space, but we do want to be holding the alloc_sem when we write to flash */ down(&c->alloc_sem);