diff options
author | David Woodhouse <dwmw2@infradead.org> | 2005-04-13 09:22:38 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-05-23 07:17:49 -0400 |
commit | 7d200960d4f3d1b50c3b9e9688408d9f81c66ff4 (patch) | |
tree | 0faf7439968a955f55871048448abb36fa44c090 /fs/jffs2/write.c | |
parent | 0a18cde60f384d1f7aa012aba004766fb633a31d (diff) |
[JFFS2] Fix inode allocation race
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'fs/jffs2/write.c')
-rw-r--r-- | fs/jffs2/write.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/jffs2/write.c b/fs/jffs2/write.c index f3910dc1c2c8..69100615d9ae 100644 --- a/fs/jffs2/write.c +++ b/fs/jffs2/write.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * | 7 | * |
8 | * For licensing information, see the file 'LICENCE' in this directory. | 8 | * For licensing information, see the file 'LICENCE' in this directory. |
9 | * | 9 | * |
10 | * $Id: write.c,v 1.91 2005/03/01 10:34:03 dedekind Exp $ | 10 | * $Id: write.c,v 1.92 2005/04/13 13:22:35 dwmw2 Exp $ |
11 | * | 11 | * |
12 | */ | 12 | */ |
13 | 13 | ||
@@ -35,13 +35,12 @@ int jffs2_do_new_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, uint | |||
35 | f->inocache = ic; | 35 | f->inocache = ic; |
36 | f->inocache->nlink = 1; | 36 | f->inocache->nlink = 1; |
37 | f->inocache->nodes = (struct jffs2_raw_node_ref *)f->inocache; | 37 | f->inocache->nodes = (struct jffs2_raw_node_ref *)f->inocache; |
38 | f->inocache->ino = ++c->highest_ino; | ||
39 | f->inocache->state = INO_STATE_PRESENT; | 38 | f->inocache->state = INO_STATE_PRESENT; |
40 | 39 | ||
41 | ri->ino = cpu_to_je32(f->inocache->ino); | ||
42 | 40 | ||
43 | D1(printk(KERN_DEBUG "jffs2_do_new_inode(): Assigned ino# %d\n", f->inocache->ino)); | ||
44 | jffs2_add_ino_cache(c, f->inocache); | 41 | jffs2_add_ino_cache(c, f->inocache); |
42 | D1(printk(KERN_DEBUG "jffs2_do_new_inode(): Assigned ino# %d\n", f->inocache->ino)); | ||
43 | ri->ino = cpu_to_je32(f->inocache->ino); | ||
45 | 44 | ||
46 | ri->magic = cpu_to_je16(JFFS2_MAGIC_BITMASK); | 45 | ri->magic = cpu_to_je16(JFFS2_MAGIC_BITMASK); |
47 | ri->nodetype = cpu_to_je16(JFFS2_NODETYPE_INODE); | 46 | ri->nodetype = cpu_to_je16(JFFS2_NODETYPE_INODE); |