Merge git://git.infradead.org/mtd-2.6

[lisovros/linux_canprio.git] / fs / jffs2 / dir.c

diff --git a/fs/jffs2/dir.c b/fs/jffs2/dir.c
index 1aaf98df49d09fea2564b616c2e437aaf24a50a5..ed78a3cf3cb047046d8ea385af9554e63214aac8 100644 (file)
--- a/fs/jffs2/dir.c
+++ b/fs/jffs2/dir.c
@@ -233,9 +233,7 @@ static int jffs2_create(struct inode *dir_i, struct dentry *dentry, int mode,
        return 0;
 
  fail:
-       make_bad_inode(inode);
-       unlock_new_inode(inode);
-       iput(inode);
+       iget_failed(inode);
        jffs2_free_raw_inode(ri);
        return ret;
 }
@@ -455,9 +453,7 @@ static int jffs2_symlink (struct inode *dir_i, struct dentry *dentry, const char
        return 0;
 
  fail:
-       make_bad_inode(inode);
-       unlock_new_inode(inode);
-       iput(inode);
+       iget_failed(inode);
        return ret;
 }
 
@@ -602,9 +598,7 @@ static int jffs2_mkdir (struct inode *dir_i, struct dentry *dentry, int mode)
        return 0;
 
  fail:
-       make_bad_inode(inode);
-       unlock_new_inode(inode);
-       iput(inode);
+       iget_failed(inode);
        return ret;
 }
 
@@ -779,9 +773,7 @@ static int jffs2_mknod (struct inode *dir_i, struct dentry *dentry, int mode, de
        return 0;
 
  fail:
-       make_bad_inode(inode);
-       unlock_new_inode(inode);
-       iput(inode);
+       iget_failed(inode);
        return ret;
 }