diff options
| -rw-r--r-- | fs/drop_caches.c | 4 | ||||
| -rw-r--r-- | fs/fs-writeback.c | 4 | ||||
| -rw-r--r-- | fs/inode.c | 12 | ||||
| -rw-r--r-- | fs/notify/inode_mark.c | 2 | ||||
| -rw-r--r-- | fs/notify/inotify/inotify.c | 2 | ||||
| -rw-r--r-- | fs/quota/dquot.c | 6 | ||||
| -rw-r--r-- | include/linux/writeback.h | 1 |
7 files changed, 31 insertions, 0 deletions
diff --git a/fs/drop_caches.c b/fs/drop_caches.c index 31f4b0e6d72c..8b6ef854aacc 100644 --- a/fs/drop_caches.c +++ b/fs/drop_caches.c @@ -17,18 +17,22 @@ static void drop_pagecache_sb(struct super_block *sb) struct inode *inode, *toput_inode = NULL; spin_lock(&inode_lock); + spin_lock(&sb_inode_list_lock); list_for_each_entry(inode, &sb->s_inodes, i_sb_list) { if (inode->i_state & (I_FREEING|I_CLEAR|I_WILL_FREE|I_NEW)) continue; if (inode->i_mapping->nrpages == 0) continue; __iget(inode); + spin_unlock(&sb_inode_list_lock); spin_unlock(&inode_lock); invalidate_mapping_pages(inode->i_mapping, 0, -1); iput(toput_inode); toput_inode = inode; spin_lock(&inode_lock); + spin_lock(&sb_inode_list_lock); } + spin_unlock(&sb_inode_list_lock); spin_unlock(&inode_lock); iput(toput_inode); } diff --git a/fs/fs-writeback.c b/fs/fs-writeback.c index 1a7c42c64ff4..f04a95a76b3f 100644 --- a/fs/fs-writeback.c +++ b/fs/fs-writeback.c @@ -1126,6 +1126,7 @@ static void wait_sb_inodes(struct super_block *sb) WARN_ON(!rwsem_is_locked(&sb->s_umount)); spin_lock(&inode_lock); + spin_lock(&sb_inode_list_lock); /* * Data integrity sync. Must wait for all pages under writeback, @@ -1143,6 +1144,7 @@ static void wait_sb_inodes(struct super_block *sb) if (mapping->nrpages == 0) continue; __iget(inode); + spin_unlock(&sb_inode_list_lock); spin_unlock(&inode_lock); /* * We hold a reference to 'inode' so it couldn't have @@ -1160,7 +1162,9 @@ static void wait_sb_inodes(struct super_block *sb) cond_resched(); spin_lock(&inode_lock); + spin_lock(&sb_inode_list_lock); } + spin_unlock(&sb_inode_list_lock); spin_unlock(&inode_lock); iput(old_inode); } diff --git a/fs/inode.c b/fs/inode.c index ce10948610e9..2f42696e14ab 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -85,6 +85,7 @@ static struct hlist_head *inode_hashtable __read_mostly; * the i_state of an inode while it is in use.. */ DEFINE_SPINLOCK(inode_lock); +DEFINE_SPINLOCK(sb_inode_list_lock); /* * iprune_sem provides exclusion between the kswapd or try_to_free_pages @@ -348,7 +349,9 @@ static void dispose_list(struct list_head *head) spin_lock(&inode_lock); hlist_del_init(&inode->i_hash); + spin_lock(&sb_inode_list_lock); list_del_init(&inode->i_sb_list); + spin_unlock(&sb_inode_list_lock); spin_unlock(&inode_lock); wake_up_inode(inode); @@ -380,6 +383,7 @@ static int invalidate_list(struct list_head *head, struct list_head *dispose) * shrink_icache_memory() away. */ cond_resched_lock(&inode_lock); + cond_resched_lock(&sb_inode_list_lock); next = next->next; if (tmp == head) @@ -417,9 +421,11 @@ int invalidate_inodes(struct super_block *sb) down_write(&iprune_sem); spin_lock(&inode_lock); + spin_lock(&sb_inode_list_lock); inotify_unmount_inodes(&sb->s_inodes); fsnotify_unmount_inodes(&sb->s_inodes); busy = invalidate_list(&sb->s_inodes, &throw_away); + spin_unlock(&sb_inode_list_lock); spin_unlock(&inode_lock); dispose_list(&throw_away); @@ -607,7 +613,9 @@ __inode_add_to_lists(struct super_block *sb, struct hlist_head *head, { inodes_stat.nr_inodes++; list_add(&inode->i_list, &inode_in_use); + spin_lock(&sb_inode_list_lock); list_add(&inode->i_sb_list, &sb->s_inodes); + spin_unlock(&sb_inode_list_lock); if (head) hlist_add_head(&inode->i_hash, head); } @@ -1201,7 +1209,9 @@ void generic_delete_inode(struct inode *inode) const struct super_operations *op = inode->i_sb->s_op; list_del_init(&inode->i_list); + spin_lock(&sb_inode_list_lock); list_del_init(&inode->i_sb_list); + spin_unlock(&sb_inode_list_lock); WARN_ON(inode->i_state & I_NEW); inode->i_state |= I_FREEING; inodes_stat.nr_inodes--; @@ -1263,7 +1273,9 @@ int generic_detach_inode(struct inode *inode) hlist_del_init(&inode->i_hash); } list_del_init(&inode->i_list); + spin_lock(&sb_inode_list_lock); list_del_init(&inode->i_sb_list); + spin_unlock(&sb_inode_list_lock); WARN_ON(inode->i_state & I_NEW); inode->i_state |= I_FREEING; inodes_stat.nr_inodes--; diff --git a/fs/notify/inode_mark.c b/fs/notify/inode_mark.c index 3165d85aada2..bfe1d2e676fd 100644 --- a/fs/notify/inode_mark.c +++ b/fs/notify/inode_mark.c @@ -409,6 +409,7 @@ void fsnotify_unmount_inodes(struct list_head *list) * will be added since the umount has begun. Finally, * iprune_mutex keeps shrink_icache_memory() away. */ + spin_unlock(&sb_inode_list_lock); spin_unlock(&inode_lock); if (need_iput_tmp) @@ -422,5 +423,6 @@ void fsnotify_unmount_inodes(struct list_head *list) iput(inode); spin_lock(&inode_lock); + spin_lock(&sb_inode_list_lock); } } diff --git a/fs/notify/inotify/inotify.c b/fs/notify/inotify/inotify.c index 1915a9a55252..c3dd7655338b 100644 --- a/fs/notify/inotify/inotify.c +++ b/fs/notify/inotify/inotify.c @@ -433,6 +433,7 @@ void inotify_unmount_inodes(struct list_head *list) * will be added since the umount has begun. Finally, * iprune_mutex keeps shrink_icache_memory() away. */ + spin_unlock(&sb_inode_list_lock); spin_unlock(&inode_lock); if (need_iput_tmp) @@ -455,6 +456,7 @@ void inotify_unmount_inodes(struct list_head *list) iput(inode); spin_lock(&inode_lock); + spin_lock(&sb_inode_list_lock); } } EXPORT_SYMBOL_GPL(inotify_unmount_inodes); diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index 6c9da00ddda2..c2620d25d1ac 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c @@ -845,6 +845,7 @@ static void add_dquot_ref(struct super_block *sb, int type) int reserved = 0; spin_lock(&inode_lock); + spin_lock(&sb_inode_list_lock); list_for_each_entry(inode, &sb->s_inodes, i_sb_list) { if (inode->i_state & (I_FREEING|I_CLEAR|I_WILL_FREE|I_NEW)) continue; @@ -856,6 +857,7 @@ static void add_dquot_ref(struct super_block *sb, int type) continue; __iget(inode); + spin_unlock(&sb_inode_list_lock); spin_unlock(&inode_lock); iput(old_inode); @@ -867,7 +869,9 @@ static void add_dquot_ref(struct super_block *sb, int type) * keep the reference and iput it later. */ old_inode = inode; spin_lock(&inode_lock); + spin_lock(&sb_inode_list_lock); } + spin_unlock(&sb_inode_list_lock); spin_unlock(&inode_lock); iput(old_inode); @@ -945,6 +949,7 @@ static void remove_dquot_ref(struct super_block *sb, int type, struct inode *inode; spin_lock(&inode_lock); + spin_lock(&sb_inode_list_lock); list_for_each_entry(inode, &sb->s_inodes, i_sb_list) { /* * We have to scan also I_NEW inodes because they can already @@ -955,6 +960,7 @@ static void remove_dquot_ref(struct super_block *sb, int type, if (!IS_NOQUOTA(inode)) remove_inode_dquot_ref(inode, type, tofree_head); } + spin_unlock(&sb_inode_list_lock); spin_unlock(&inode_lock); } diff --git a/include/linux/writeback.h b/include/linux/writeback.h index 76e8903cd204..544363be9933 100644 --- a/include/linux/writeback.h +++ b/include/linux/writeback.h @@ -10,6 +10,7 @@ struct backing_dev_info; extern spinlock_t inode_lock; +extern spinlock_t sb_inode_list_lock; extern struct list_head inode_in_use; extern struct list_head inode_unused; |