On Thu, 2009-04-23 at 23:35 +0200, Jan Kara wrote:
> __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: Jan Kara <jack@xxxxxxx>
> ---
> fs/block_dev.c | 2 +-
> fs/super.c | 5 ++---
> include/linux/fs.h | 1 -
> 3 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/fs/block_dev.c b/fs/block_dev.c
> index f45dbc1..48d1290 100644
> --- a/fs/block_dev.c
> +++ b/fs/block_dev.c
> @@ -240,7 +240,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();
> diff --git a/fs/super.c b/fs/super.c
> index d9759e0..4c92068 100644
> --- a/fs/super.c
> +++ b/fs/super.c
> @@ -263,7 +263,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);
Still missing the return value here :-)
> @@ -284,8 +284,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);
>
> diff --git a/include/linux/fs.h b/include/linux/fs.h
> index 4bad02e..47a67c9 100644
> --- a/include/linux/fs.h
> +++ b/include/linux/fs.h
> @@ -2084,7 +2084,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,
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
