Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 429479f0 authored by Jan Kara's avatar Jan Kara Committed by Al Viro
Browse files

vfs: Make __fsync_super() a static function (version 4) 



__fsync_super() does the same thing as fsync_super(). So change the only
caller to use fsync_super() and make __fsync_super() static. This removes
unnecessarily duplicated call to sync_blockdev() and prepares ground
for the changes to __fsync_super() in the following patches.

Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent bfe88125

fs/block_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ struct super_block *freeze_bdev(struct block_device *bdev) 
		sb->s_frozen = SB_FREEZE_WRITE;

		smp_wmb();



		__fsync_super(sb);

		fsync_super(sb);



		sb->s_frozen = SB_FREEZE_TRANS;

		smp_wmb();

fs/super.c

+3 −4
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ EXPORT_SYMBOL(unlock_super); 
 * device.  Takes the superblock lock.  Requires a second blkdev

 * flush by the caller to complete the operation.

 */

void __fsync_super(struct super_block *sb)

static int __fsync_super(struct super_block *sb)

{

	sync_inodes_sb(sb, 0);

	vfs_dq_sync(sb);
@@ -300,7 +300,7 @@ void __fsync_super(struct super_block *sb) 
	unlock_super(sb);

	if (sb->s_op->sync_fs)

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

	sync_blockdev(sb->s_bdev);

	return sync_blockdev(sb->s_bdev);

}



/*
@@ -310,8 +310,7 @@ void __fsync_super(struct super_block *sb) 
 */

int fsync_super(struct super_block *sb)

{

	__fsync_super(sb);

	return sync_blockdev(sb->s_bdev);

	return __fsync_super(sb);

}

EXPORT_SYMBOL_GPL(fsync_super);

include/linux/fs.h

+0 −1
Original line number Diff line number Diff line
@@ -2078,7 +2078,6 @@ extern int filemap_fdatawrite_range(struct address_space *mapping, 
extern int vfs_fsync(struct file *file, struct dentry *dentry, int datasync);

extern void sync_supers(void);

extern void sync_filesystems(int wait);

extern void __fsync_super(struct super_block *sb);

extern void emergency_sync(void);

extern void emergency_remount(void);

extern int do_remount_sb(struct super_block *sb, int flags,