diff options
| author | Darrick J. Wong <djwong@kernel.org> | 2022-01-30 19:53:16 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-02-23 13:56:39 +0300 |
| commit | 7e5db6d92197a7fd9d725a6029652b5812a9c8a7 (patch) | |
| tree | d970ec229fcbbc0ffebd49baab6ffbba8d9822d8 | |
| parent | ca8dcffb809621ee80c47817a0a798f42bd29d41 (diff) | |
| download | linux-7e5db6d92197a7fd9d725a6029652b5812a9c8a7.tar.xz | |
quota: make dquot_quota_sync return errors from ->sync_fs
[ Upstream commit dd5532a4994bfda0386eb2286ec00758cee08444 ]
Strangely, dquot_quota_sync ignores the return code from the ->sync_fs
call, which means that quotacalls like Q_SYNC 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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | fs/quota/dquot.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index 82a5ecbe2da9..022b237c6a13 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c @@ -676,9 +676,14 @@ int dquot_quota_sync(struct super_block *sb, int type) /* This is not very clever (and fast) but currently I don't know about * any other simple way of getting quota data to disk and we must get * them there for userspace to be visible... */ - if (sb->s_op->sync_fs) - sb->s_op->sync_fs(sb, 1); - sync_blockdev(sb->s_bdev); + if (sb->s_op->sync_fs) { + ret = sb->s_op->sync_fs(sb, 1); + if (ret) + return ret; + } + ret = sync_blockdev(sb->s_bdev); + if (ret) + return ret; /* * Now when everything is written we can discard the pagecache so |