1 files changed, 8 insertions, 21 deletions

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 18584d4c078a..204524943bc6 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -185,8 +185,6 @@ bool f2fs_need_SSR(struct f2fs_sb_info *sbi)
 
 void f2fs_register_inmem_page(struct inode *inode, struct page *page)
 {
-        struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
-        struct f2fs_inode_info *fi = F2FS_I(inode);
         struct inmem_pages *new;
 
         f2fs_trace_pid(page);
@@ -200,15 +198,11 @@ void f2fs_register_inmem_page(struct inode *inode, struct page *page)
         INIT_LIST_HEAD(&new->list);
 
         /* increase reference count with clean state */
-        mutex_lock(&fi->inmem_lock);
         get_page(page);
-        list_add_tail(&new->list, &fi->inmem_pages);
-        spin_lock(&sbi->inode_lock[ATOMIC_FILE]);
-        if (list_empty(&fi->inmem_ilist))
-                list_add_tail(&fi->inmem_ilist, &sbi->inode_list[ATOMIC_FILE]);
-        spin_unlock(&sbi->inode_lock[ATOMIC_FILE]);
+        mutex_lock(&F2FS_I(inode)->inmem_lock);
+        list_add_tail(&new->list, &F2FS_I(inode)->inmem_pages);
         inc_page_count(F2FS_I_SB(inode), F2FS_INMEM_PAGES);
-        mutex_unlock(&fi->inmem_lock);
+        mutex_unlock(&F2FS_I(inode)->inmem_lock);
 
         trace_f2fs_register_inmem_page(page, INMEM);
 }
@@ -330,19 +324,17 @@ void f2fs_drop_inmem_pages(struct inode *inode)
                 mutex_lock(&fi->inmem_lock);
                 __revoke_inmem_pages(inode, &fi->inmem_pages,
                                                 true, false, true);
-
-                if (list_empty(&fi->inmem_pages)) {
-                        spin_lock(&sbi->inode_lock[ATOMIC_FILE]);
-                        if (!list_empty(&fi->inmem_ilist))
-                                list_del_init(&fi->inmem_ilist);
-                        spin_unlock(&sbi->inode_lock[ATOMIC_FILE]);
-                }
                 mutex_unlock(&fi->inmem_lock);
         }
 
         clear_inode_flag(inode, FI_ATOMIC_FILE);
         fi->i_gc_failures[GC_FAILURE_ATOMIC] = 0;
         stat_dec_atomic_write(inode);
+
+        spin_lock(&sbi->inode_lock[ATOMIC_FILE]);
+        if (!list_empty(&fi->inmem_ilist))
+                list_del_init(&fi->inmem_ilist);
+        spin_unlock(&sbi->inode_lock[ATOMIC_FILE]);
 }
 
 void f2fs_drop_inmem_page(struct inode *inode, struct page *page)
@@ -471,11 +463,6 @@ int f2fs_commit_inmem_pages(struct inode *inode)
 
         mutex_lock(&fi->inmem_lock);
         err = __f2fs_commit_inmem_pages(inode);
-
-        spin_lock(&sbi->inode_lock[ATOMIC_FILE]);
-        if (!list_empty(&fi->inmem_ilist))
-                list_del_init(&fi->inmem_ilist);
-        spin_unlock(&sbi->inode_lock[ATOMIC_FILE]);
         mutex_unlock(&fi->inmem_lock);
 
         clear_inode_flag(inode, FI_ATOMIC_COMMIT);