diff options
| author | Darrick J. Wong <djwong@kernel.org> | 2022-01-30 17:53:16 +0100 |
|---|---|---|
| committer | Darrick J. Wong <djwong@kernel.org> | 2022-01-30 17:59:47 +0100 |
| commit | 5679897eb104cec9e99609c3f045a0c20603da4c (patch) | |
| tree | 4b138d97d9eb4719e22e6c7c40a6652c6f2eeb0e /fs/sync.c | |
| parent | vfs: make freeze_super abort when sync_filesystem returns error (diff) | |
| download | linux-5679897eb104cec9e99609c3f045a0c20603da4c.tar.xz linux-5679897eb104cec9e99609c3f045a0c20603da4c.zip | |
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>
Diffstat (limited to 'fs/sync.c')
| -rw-r--r-- | fs/sync.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/fs/sync.c b/fs/sync.c index 3ce8e2137f31..c7690016453e 100644 --- a/fs/sync.c +++ b/fs/sync.c @@ -29,7 +29,7 @@ */ int sync_filesystem(struct super_block *sb) { - int ret; + int ret = 0; /* * We need to be protected against the filesystem going from @@ -52,15 +52,21 @@ int sync_filesystem(struct super_block *sb) * at a time. */ writeback_inodes_sb(sb, WB_REASON_SYNC); - if (sb->s_op->sync_fs) - sb->s_op->sync_fs(sb, 0); + if (sb->s_op->sync_fs) { + ret = sb->s_op->sync_fs(sb, 0); + if (ret) + return ret; + } ret = sync_blockdev_nowait(sb->s_bdev); - if (ret < 0) + if (ret) return ret; sync_inodes_sb(sb); - if (sb->s_op->sync_fs) - sb->s_op->sync_fs(sb, 1); + if (sb->s_op->sync_fs) { + ret = sb->s_op->sync_fs(sb, 1); + if (ret) + return ret; + } return sync_blockdev(sb->s_bdev); } EXPORT_SYMBOL(sync_filesystem); |