Commit 9a208ba5 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

fs: remove __sync_filesystem 



There is no clear benefit in having this helper vs just open coding it.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Link: https://lore.kernel.org/r/20211019062530.2174626-2-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 8e9f666a

fs/sync.c

+17 −21
Original line number Diff line number Diff line
@@ -21,25 +21,6 @@ 
#define VALID_FLAGS (SYNC_FILE_RANGE_WAIT_BEFORE|SYNC_FILE_RANGE_WRITE| \

			SYNC_FILE_RANGE_WAIT_AFTER)



/*

 * Do the filesystem syncing work. For simple filesystems

 * writeback_inodes_sb(sb) just dirties buffers with inodes so we have to

 * submit IO for these buffers via __sync_blockdev(). This also speeds up the

 * wait == 1 case since in that case write_inode() functions do

 * sync_dirty_buffer() and thus effectively write one block at a time.

 */

static int __sync_filesystem(struct super_block *sb, int wait)

{

	if (wait)

		sync_inodes_sb(sb);

	else

		writeback_inodes_sb(sb, WB_REASON_SYNC);



	if (sb->s_op->sync_fs)

		sb->s_op->sync_fs(sb, wait);

	return __sync_blockdev(sb->s_bdev, wait);

}



/*

 * Write out and wait upon all dirty data associated with this

 * superblock.  Filesystem data as well as the underlying block
@@ -61,10 +42,25 @@ int sync_filesystem(struct super_block *sb) 
	if (sb_rdonly(sb))

		return 0;



	ret = __sync_filesystem(sb, 0);

	/*

	 * Do the filesystem syncing work.  For simple filesystems

	 * writeback_inodes_sb(sb) just dirties buffers with inodes so we have

	 * to submit I/O for these buffers via __sync_blockdev().  This also

	 * speeds up the wait == 1 case since in that case write_inode()

	 * methods call sync_dirty_buffer() and thus effectively write one block

	 * at a time.

	 */

	writeback_inodes_sb(sb, WB_REASON_SYNC);

	if (sb->s_op->sync_fs)

		sb->s_op->sync_fs(sb, 0);

	ret = __sync_blockdev(sb->s_bdev, 0);

	if (ret < 0)

		return ret;

	return __sync_filesystem(sb, 1);



	sync_inodes_sb(sb);

	if (sb->s_op->sync_fs)

		sb->s_op->sync_fs(sb, 1);

	return __sync_blockdev(sb->s_bdev, 1);

}

EXPORT_SYMBOL(sync_filesystem);