Commit 19901165 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-5.16/inode-sync-2021-10-29' of git://git.kernel.dk/linux-block 

Pull block inode sync updates from Jens Axboe:
 "This contains improvements to how bdev inode syncing is handled,
  unifying the API"

* tag 'for-5.16/inode-sync-2021-10-29' of git://git.kernel.dk/linux-block:
  block: simplify the block device syncing code
  ntfs3: use sync_blockdev_nowait
  fat: use sync_blockdev_nowait
  btrfs: use sync_blockdev
  xen-blkback: use sync_blockdev
  block: remove __sync_blockdev
  fs: remove __sync_filesystem
parents b6773cdb 1e03a36b

block/bdev.c

+20 −8
Original line number Diff line number Diff line
@@ -185,14 +185,13 @@ int sb_min_blocksize(struct super_block *sb, int size) 


EXPORT_SYMBOL(sb_min_blocksize);



int __sync_blockdev(struct block_device *bdev, int wait)

int sync_blockdev_nowait(struct block_device *bdev)

{

	if (!bdev)

		return 0;

	if (!wait)

	return filemap_flush(bdev->bd_inode->i_mapping);

	return filemap_write_and_wait(bdev->bd_inode->i_mapping);

}

EXPORT_SYMBOL_GPL(sync_blockdev_nowait);



/*

 * Write out and wait upon all the dirty data associated with a block
@@ -200,7 +199,9 @@ int __sync_blockdev(struct block_device *bdev, int wait) 
 */

int sync_blockdev(struct block_device *bdev)

{

	return __sync_blockdev(bdev, 1);

	if (!bdev)

		return 0;

	return filemap_write_and_wait(bdev->bd_inode->i_mapping);

}

EXPORT_SYMBOL(sync_blockdev);
@@ -1020,7 +1021,7 @@ int __invalidate_device(struct block_device *bdev, bool kill_dirty) 
}

EXPORT_SYMBOL(__invalidate_device);



void iterate_bdevs(void (*func)(struct block_device *, void *), void *arg)

void sync_bdevs(bool wait)

{

	struct inode *inode, *old_inode = NULL;
@@ -1051,8 +1052,19 @@ void iterate_bdevs(void (*func)(struct block_device *, void *), void *arg) 
		bdev = I_BDEV(inode);



		mutex_lock(&bdev->bd_disk->open_mutex);

		if (bdev->bd_openers)

			func(bdev, arg);

		if (!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);



		spin_lock(&blockdev_superblock->s_inode_list_lock);

drivers/block/xen-blkback/xenbus.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static void xen_update_blkif_status(struct xen_blkif *blkif) 
		return;

	}



	err = filemap_write_and_wait(blkif->vbd.bdev->bd_inode->i_mapping);

	err = sync_blockdev(blkif->vbd.bdev);

	if (err) {

		xenbus_dev_error(blkif->be->dev, err, "block flush");

		return;

fs/btrfs/volumes.c

+1 −1
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ btrfs_get_bdev_and_sb(const char *device_path, fmode_t flags, void *holder, 
	}



	if (flush)

		filemap_write_and_wait((*bdev)->bd_inode->i_mapping);

		sync_blockdev(*bdev);

	ret = set_blocksize(*bdev, BTRFS_BDEV_BLOCKSIZE);

	if (ret) {

		blkdev_put(*bdev, flags);

fs/fat/inode.c

+2 −4
Original line number Diff line number Diff line
@@ -1940,10 +1940,8 @@ int fat_flush_inodes(struct super_block *sb, struct inode *i1, struct inode *i2) 
		ret = writeback_inode(i1);

	if (!ret && i2)

		ret = writeback_inode(i2);

	if (!ret) {

		struct address_space *mapping = sb->s_bdev->bd_inode->i_mapping;

		ret = filemap_flush(mapping);

	}

	if (!ret)

		ret = sync_blockdev_nowait(sb->s_bdev);

	return ret;

}

EXPORT_SYMBOL_GPL(fat_flush_inodes);

fs/internal.h

+0 −11
Original line number Diff line number Diff line
@@ -23,22 +23,11 @@ struct pipe_inode_info; 
#ifdef CONFIG_BLOCK

extern void __init bdev_cache_init(void);



extern int __sync_blockdev(struct block_device *bdev, int wait);

void iterate_bdevs(void (*)(struct block_device *, void *), void *);

void emergency_thaw_bdev(struct super_block *sb);

#else

static inline void bdev_cache_init(void)

{

}



static inline int __sync_blockdev(struct block_device *bdev, int wait)

{

	return 0;

}

static inline void iterate_bdevs(void (*f)(struct block_device *, void *),

		void *arg)

{

}

static inline int emergency_thaw_bdev(struct super_block *sb)

{

	return 0;