github/open-cas-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #995 from robertbaldyga/return-kernel-errors-on-io-path

Browse Source 
Return kernel error codes on I/O path
This commit is contained in:
Robert Baldyga 2021-11-23 17:02:45 +01:00 committed by GitHub
commit 2ce3f52d7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/cas_cache/volume/vol_block_dev_top.c
View File

@ -195,6 +195,8 @@ static void blkdev_defer_bio(struct bd_object *bvol, struct bio *bio,
static void blkdev_complete_data_master(struct blk_data *master, int error) static void blkdev_complete_data_master(struct blk_data *master, int error)
{ {
int result;
master->error = master->error ?: error; master->error = master->error ?: error;
if (atomic_dec_return(&master->master_remaining)) if (atomic_dec_return(&master->master_remaining))
@ -202,7 +204,8 @@ static void blkdev_complete_data_master(struct blk_data *master, int error)
cas_generic_end_io_acct(master->bio, master->start_time); cas_generic_end_io_acct(master->bio, master->start_time);
CAS_BIO_ENDIO(master->bio, master->master_size, CAS_ERRNO_TO_BLK_STS(error)); result = master->error ? -EIO : 0;
CAS_BIO_ENDIO(master->bio, master->master_size, CAS_ERRNO_TO_BLK_STS(result));
cas_free_blk_data(master); cas_free_blk_data(master);
} }
@ -337,8 +340,9 @@ err:
static void blkdev_complete_discard(struct ocf_io *io, int error) static void blkdev_complete_discard(struct ocf_io *io, int error)
{ {
struct bio *bio = io->priv1; struct bio *bio = io->priv1;
int result = error ? -EIO : 0;
CAS_BIO_ENDIO(bio, CAS_BIO_BISIZE(bio), CAS_ERRNO_TO_BLK_STS(error)); CAS_BIO_ENDIO(bio, CAS_BIO_BISIZE(bio), CAS_ERRNO_TO_BLK_STS(result));
ocf_io_put(io); ocf_io_put(io);
} }
@ -378,12 +382,13 @@ static void blkdev_complete_flush(struct ocf_io *io, int error)
{ {
struct bio *bio = io->priv1; struct bio *bio = io->priv1;
struct bd_object *bvol = io->priv2; struct bd_object *bvol = io->priv2;
int result = error ? -EIO : 0;
ocf_io_put(io); ocf_io_put(io);
if (CAS_BIO_BISIZE(bio) == 0 || error) { if (CAS_BIO_BISIZE(bio) == 0 || error) {
CAS_BIO_ENDIO(bio, CAS_BIO_BISIZE(bio), CAS_BIO_ENDIO(bio, CAS_BIO_BISIZE(bio),
CAS_ERRNO_TO_BLK_STS(error)); CAS_ERRNO_TO_BLK_STS(result));
return; return;
} }