vfs: make sync_filesystem return errors from ->sync_fs
Strangely, sync_filesystem ignores the return code from the ->sync_fs call, which means that syscalls like syncfs(2) never see the error. This doesn't seem right, so fix that. Signed-off-by: Darrick J. Wong <djwong@kernel.org> Reviewed-by: Jan Kara <jack@suse.cz> Reviewed-by: Christoph Hellwig <hch@lst.de> Acked-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Родитель
2719c7160d
Коммит
5679897eb1
18
fs/sync.c
18
fs/sync.c
|
@ -29,7 +29,7 @@
|
||||||
*/
|
*/
|
||||||
int sync_filesystem(struct super_block *sb)
|
int sync_filesystem(struct super_block *sb)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret = 0;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We need to be protected against the filesystem going from
|
* We need to be protected against the filesystem going from
|
||||||
|
@ -52,15 +52,21 @@ int sync_filesystem(struct super_block *sb)
|
||||||
* at a time.
|
* at a time.
|
||||||
*/
|
*/
|
||||||
writeback_inodes_sb(sb, WB_REASON_SYNC);
|
writeback_inodes_sb(sb, WB_REASON_SYNC);
|
||||||
if (sb->s_op->sync_fs)
|
if (sb->s_op->sync_fs) {
|
||||||
sb->s_op->sync_fs(sb, 0);
|
ret = sb->s_op->sync_fs(sb, 0);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
ret = sync_blockdev_nowait(sb->s_bdev);
|
ret = sync_blockdev_nowait(sb->s_bdev);
|
||||||
if (ret < 0)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
sync_inodes_sb(sb);
|
sync_inodes_sb(sb);
|
||||||
if (sb->s_op->sync_fs)
|
if (sb->s_op->sync_fs) {
|
||||||
sb->s_op->sync_fs(sb, 1);
|
ret = sb->s_op->sync_fs(sb, 1);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
return sync_blockdev(sb->s_bdev);
|
return sync_blockdev(sb->s_bdev);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(sync_filesystem);
|
EXPORT_SYMBOL(sync_filesystem);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче