Convert sync_bdevs() to super_iter_inodes(). No functional change. Signed-off-by: Huang Shijie --- block/bdev.c | 86 +++++++++++++++++++++------------------------------- 1 file changed, 34 insertions(+), 52 deletions(-) diff --git a/block/bdev.c b/block/bdev.c index 3c1d38475607..37fa47fb15ac 100644 --- a/block/bdev.c +++ b/block/bdev.c @@ -1339,66 +1339,48 @@ void bdev_mark_dead(struct block_device *bdev, bool surprise) */ EXPORT_SYMBOL_GPL(bdev_mark_dead); -void sync_bdevs(bool wait) +static bool sync_bdev_eligible(struct inode *inode, void *priv) { - struct inode *inode, *old_inode = NULL; + return inode->i_mapping->nrpages != 0; +} - 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; +static int sync_bdev_fn(struct inode *inode, void *priv) +{ + bool wait = *(bool *)priv; + struct block_device *bdev; - spin_lock(&inode->i_lock); - if (inode_state_read(inode) & (I_FREEING | I_WILL_FREE | I_NEW) || - mapping->nrpages == 0) { - spin_unlock(&inode->i_lock); - continue; - } - __iget(inode); - spin_unlock(&inode->i_lock); - spin_unlock(&blockdev_superblock->s_inode_list_lock); - /* - * We hold a reference to 'inode' so it couldn't have been - * removed from s_inodes list while we dropped the - * s_inode_list_lock We cannot iput the inode now as we can - * be holding the last reference and we cannot iput it under - * s_inode_list_lock. So we keep the reference and iput it - * later. - */ - iput(old_inode); - old_inode = inode; - bdev = I_BDEV(inode); + bdev = I_BDEV(inode); + /* + * The inode does not keep the gendisk of a partition alive, the + * device does. + */ + if (!kobject_get_unless_zero(&bdev->bd_device.kobj)) + return INO_ITER_RET_NEXT; + mutex_lock(&bdev->bd_disk->open_mutex); + if (!atomic_read(&bdev->bd_openers)) { + ; /* skip */ + } else if (wait) { /* - * The inode does not keep the gendisk of a partition alive, the - * device does. + * We keep the error status of individual mapping so + * that applications can catch the writeback error using + * fsync(2). See filemap_fdatawait_keep_errors() for + * details. */ - if (!kobject_get_unless_zero(&bdev->bd_device.kobj)) { - spin_lock(&blockdev_superblock->s_inode_list_lock); - continue; - } + filemap_fdatawait_keep_errors(inode->i_mapping); + } else { + filemap_fdatawrite(inode->i_mapping); + } + mutex_unlock(&bdev->bd_disk->open_mutex); + put_device(&bdev->bd_device); - mutex_lock(&bdev->bd_disk->open_mutex); - if (!atomic_read(&bdev->bd_openers)) { - ; /* skip */ - } else if (wait) { - /* - * We keep the error status of individual mapping so - * that applications can catch the writeback error using - * fsync(2). See filemap_fdatawait_keep_errors() for - * details. - */ - filemap_fdatawait_keep_errors(inode->i_mapping); - } else { - filemap_fdatawrite(inode->i_mapping); - } - mutex_unlock(&bdev->bd_disk->open_mutex); - put_device(&bdev->bd_device); + return INO_ITER_RET_NEXT; +} - spin_lock(&blockdev_superblock->s_inode_list_lock); - } - spin_unlock(&blockdev_superblock->s_inode_list_lock); - iput(old_inode); +void sync_bdevs(bool wait) +{ + super_iter_inodes(blockdev_superblock, sync_bdev_fn, + sync_bdev_eligible, &wait, 0); } /* -- 2.53.0