Merge "block: protect iterate_bdevs() against concurrent close" (7fa84a1a) · Commits · e / devices / android_kernel_sony_msm8998

fs/block_dev.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -1806,6 +1806,7 @@ void iterate_bdevs(void (func)(struct block_device , void ), void arg)
		spin_lock(&blockdev_superblock->s_inode_list_lock);
		list_for_each_entry(inode, &blockdev_superblock->s_inodes, i_sb_list) {
		struct address_space *mapping = inode->i_mapping;
		struct block_device *bdev;

		spin_lock(&inode->i_lock);
		if (inode->i_state & (I_FREEING\|I_WILL_FREE\|I_NEW) \|\|
		@@ -1826,8 +1827,12 @@ void iterate_bdevs(void (func)(struct block_device , void ), void arg)
		*/
		iput(old_inode);
		old_inode = inode;
		bdev = I_BDEV(inode);

		func(I_BDEV(inode), arg);
		mutex_lock(&bdev->bd_mutex);
		if (bdev->bd_openers)
		func(bdev, arg);
		mutex_unlock(&bdev->bd_mutex);

		spin_lock(&blockdev_superblock->s_inode_list_lock);
		}