f2fs: call f2fs_unlock_op after error was handled

This patch relocates f2fs_unlock_op in every directory operations to be called
after any error was processed.
Otherwise, the checkpoint can be entered with valid node ids without its
dentry when -ENOSPC is occurred.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 94cfdc4d0c00619bd68a8e88783bf9777e6588cc..a397f7ac99459e332fd7ab8841d42c5347a8c281 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -1194,6 +1194,7 @@ void update_inode(struct inode *, struct page *);
 void update_inode_page(struct inode *);
 int f2fs_write_inode(struct inode *, struct writeback_control *);
 void f2fs_evict_inode(struct inode *);
+void handle_failed_inode(struct inode *);
 
 /*
  * namei.c

diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index ff95547cfc3dcaf0753a2525934b600ad3530ac3..63923eef1ffe9d8a38e027fb91a108bf5f5cf505 100644 (file)
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -306,3 +306,26 @@ no_delete:
 out_clear:
        clear_inode(inode);
 }
+
+/* caller should call f2fs_lock_op() */
+void handle_failed_inode(struct inode *inode)
+{
+       struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
+
+       clear_nlink(inode);
+       make_bad_inode(inode);
+       unlock_new_inode(inode);
+
+       i_size_write(inode, 0);
+       if (F2FS_HAS_BLOCKS(inode))
+               f2fs_truncate(inode);
+
+       remove_inode_page(inode);
+       stat_dec_inline_inode(inode);
+
+       alloc_nid_failed(sbi, inode->i_ino);
+       f2fs_unlock_op(sbi);
+
+       /* iput will drop the inode object */
+       iput(inode);
+}

diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index ba0779d4cfd7e9454abc47a06a9233d244b668bc..0d2526e5aa11401016a985681bff7036bbe54e48 100644 (file)
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -123,9 +123,9 @@ static int f2fs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
 
        f2fs_lock_op(sbi);
        err = f2fs_add_link(dentry, inode);
-       f2fs_unlock_op(sbi);
        if (err)
                goto out;
+       f2fs_unlock_op(sbi);
 
        alloc_nid_done(sbi, ino);
 
@@ -133,9 +133,7 @@ static int f2fs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
        unlock_new_inode(inode);
        return 0;
 out:
-       clear_nlink(inode);
-       iget_failed(inode);
-       alloc_nid_failed(sbi, ino);
+       handle_failed_inode(inode);
        return err;
 }
 
@@ -154,15 +152,16 @@ static int f2fs_link(struct dentry *old_dentry, struct inode *dir,
        set_inode_flag(F2FS_I(inode), FI_INC_LINK);
        f2fs_lock_op(sbi);
        err = f2fs_add_link(dentry, inode);
-       f2fs_unlock_op(sbi);
        if (err)
                goto out;
+       f2fs_unlock_op(sbi);
 
        d_instantiate(dentry, inode);
        return 0;
 out:
        clear_inode_flag(F2FS_I(inode), FI_INC_LINK);
        iput(inode);
+       f2fs_unlock_op(sbi);
        return err;
 }
 
@@ -253,9 +252,9 @@ static int f2fs_symlink(struct inode *dir, struct dentry *dentry,
 
        f2fs_lock_op(sbi);
        err = f2fs_add_link(dentry, inode);
-       f2fs_unlock_op(sbi);
        if (err)
                goto out;
+       f2fs_unlock_op(sbi);
 
        err = page_symlink(inode, symname, symlen);
        alloc_nid_done(sbi, inode->i_ino);
@@ -264,9 +263,7 @@ static int f2fs_symlink(struct inode *dir, struct dentry *dentry,
        unlock_new_inode(inode);
        return err;
 out:
-       clear_nlink(inode);
-       iget_failed(inode);
-       alloc_nid_failed(sbi, inode->i_ino);
+       handle_failed_inode(inode);
        return err;
 }
 
@@ -290,9 +287,9 @@ static int f2fs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
        set_inode_flag(F2FS_I(inode), FI_INC_LINK);
        f2fs_lock_op(sbi);
        err = f2fs_add_link(dentry, inode);
-       f2fs_unlock_op(sbi);
        if (err)
                goto out_fail;
+       f2fs_unlock_op(sbi);
 
        alloc_nid_done(sbi, inode->i_ino);
 
@@ -303,9 +300,7 @@ static int f2fs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
 
 out_fail:
        clear_inode_flag(F2FS_I(inode), FI_INC_LINK);
-       clear_nlink(inode);
-       iget_failed(inode);
-       alloc_nid_failed(sbi, inode->i_ino);
+       handle_failed_inode(inode);
        return err;
 }
 
@@ -338,18 +333,16 @@ static int f2fs_mknod(struct inode *dir, struct dentry *dentry,
 
        f2fs_lock_op(sbi);
        err = f2fs_add_link(dentry, inode);
-       f2fs_unlock_op(sbi);
        if (err)
                goto out;
+       f2fs_unlock_op(sbi);
 
        alloc_nid_done(sbi, inode->i_ino);
        d_instantiate(dentry, inode);
        unlock_new_inode(inode);
        return 0;
 out:
-       clear_nlink(inode);
-       iget_failed(inode);
-       alloc_nid_failed(sbi, inode->i_ino);
+       handle_failed_inode(inode);
        return err;
 }
 
@@ -677,10 +670,7 @@ static int f2fs_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode)
 release_out:
        release_orphan_inode(sbi);
 out:
-       f2fs_unlock_op(sbi);
-       clear_nlink(inode);
-       iget_failed(inode);
-       alloc_nid_failed(sbi, inode->i_ino);
+       handle_failed_inode(inode);
        return err;
 }