1 files changed, 30 insertions, 9 deletions

diff --git a/fs/inode.c b/fs/inode.c
index a48fa5355fb4..d0c72ff6b30e 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -361,9 +361,11 @@ EXPORT_SYMBOL_GPL(inode_sb_list_add);
 
 static inline void inode_sb_list_del(struct inode *inode)
 {
-        spin_lock(&inode_sb_list_lock);
-        list_del_init(&inode->i_sb_list);
-        spin_unlock(&inode_sb_list_lock);
+        if (!list_empty(&inode->i_sb_list)) {
+                spin_lock(&inode_sb_list_lock);
+                list_del_init(&inode->i_sb_list);
+                spin_unlock(&inode_sb_list_lock);
+        }
 }
 
 static unsigned long hash(struct super_block *sb, unsigned long hashval)
@@ -796,6 +798,29 @@ unsigned int get_next_ino(void)
 EXPORT_SYMBOL(get_next_ino);
 
 /**
+ *      new_inode_pseudo        - obtain an inode
+ *      @sb: superblock
+ *
+ *      Allocates a new inode for given superblock.
+ *      Inode wont be chained in superblock s_inodes list
+ *      This means :
+ *      - fs can't be unmount
+ *      - quotas, fsnotify, writeback can't work
+ */
+struct inode *new_inode_pseudo(struct super_block *sb)
+{
+        struct inode *inode = alloc_inode(sb);
+
+        if (inode) {
+                spin_lock(&inode->i_lock);
+                inode->i_state = 0;
+                spin_unlock(&inode->i_lock);
+                INIT_LIST_HEAD(&inode->i_sb_list);
+        }
+        return inode;
+}
+
+/**
  *      new_inode       - obtain an inode
  *      @sb: superblock
  *
@@ -813,13 +838,9 @@ struct inode *new_inode(struct super_block *sb)
 
         spin_lock_prefetch(&inode_sb_list_lock);
 
-        inode = alloc_inode(sb);
-        if (inode) {
-                spin_lock(&inode->i_lock);
-                inode->i_state = 0;
-                spin_unlock(&inode->i_lock);
+        inode = new_inode_pseudo(sb);
+        if (inode)
                 inode_sb_list_add(inode);
-        }
         return inode;
 }
 EXPORT_SYMBOL(new_inode);