Merge android-4.4.187 (8eb3d65) into msm-4.4

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / fs / f2fs / namei.c

diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index 54acf45..94902b8 100644 (file)
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -300,8 +300,8 @@ static int f2fs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
 
        f2fs_alloc_nid_done(sbi, ino);
 
-       unlock_new_inode(inode);
        d_instantiate(dentry, inode);
+       unlock_new_inode(inode);
 
        if (IS_DIRSYNC(dir))
                f2fs_sync_fs(sbi->sb, 1);
@@ -604,8 +604,8 @@ static int f2fs_symlink(struct inode *dir, struct dentry *dentry,
        err = page_symlink(inode, disk_link.name, disk_link.len);
 
 err_out:
-       unlock_new_inode(inode);
        d_instantiate(dentry, inode);
+       unlock_new_inode(inode);
 
        /*
         * Let's flush symlink data in order to avoid broken symlink as much as
@@ -668,8 +668,8 @@ static int f2fs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
 
        f2fs_alloc_nid_done(sbi, inode->i_ino);
 
-       unlock_new_inode(inode);
        d_instantiate(dentry, inode);
+       unlock_new_inode(inode);
 
        if (IS_DIRSYNC(dir))
                f2fs_sync_fs(sbi->sb, 1);
@@ -723,8 +723,8 @@ static int f2fs_mknod(struct inode *dir, struct dentry *dentry,
 
        f2fs_alloc_nid_done(sbi, inode->i_ino);
 
-       unlock_new_inode(inode);
        d_instantiate(dentry, inode);
+       unlock_new_inode(inode);
 
        if (IS_DIRSYNC(dir))
                f2fs_sync_fs(sbi->sb, 1);