git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/~dwmw2/mtd-2.6.35
[safe/jmp/linux-2.6]
/
fs
/
jffs2
/
fs.c
diff --git
a/fs/jffs2/fs.c
b/fs/jffs2/fs.c
index
8bc2c80
..
459d39d
100644
(file)
--- a/
fs/jffs2/fs.c
+++ b/
fs/jffs2/fs.c
@@
-465,7
+465,12
@@
struct inode *jffs2_new_inode (struct inode *dir_i, int mode, struct jffs2_raw_i
inode->i_blocks = 0;
inode->i_size = 0;
inode->i_blocks = 0;
inode->i_size = 0;
- insert_inode_hash(inode);
+ if (insert_inode_locked(inode) < 0) {
+ make_bad_inode(inode);
+ unlock_new_inode(inode);
+ iput(inode);
+ return ERR_PTR(-EINVAL);
+ }
return inode;
}
return inode;
}