[RHEL8,COMMIT] cbt: Actually show errors on return

Submitted by Konstantin Khorenko on Dec. 10, 2019, 3:44 p.m.

Details

Message ID 201912101544.xBAFiQf8024271@finist_co8.work.ct
State New
Series "cbt: Actually show errors on return"
Headers show

Commit Message

Konstantin Khorenko Dec. 10, 2019, 3:44 p.m.
The commit is pushed to "branch-rh8-4.18.0-80.1.2.vz8.2.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh8-4.18.0-80.1.2.vz8.2.6
------>
commit 6779eff6cbbee8684dab040d6ba9ce7af2492853
Author: Kirill Tkhai <ktkhai@virtuozzo.com>
Date:   Tue Dec 10 18:44:26 2019 +0300

    cbt: Actually show errors on return
    
    Currently 0 is always returned.
    
    Fixes: 5d46a2bbb3d1 ("cbt: Change errno values for new ioctl")
    
    Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
 block/blk-cbt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/block/blk-cbt.c b/block/blk-cbt.c
index 012e3740b2da..dddac68b61b4 100644
--- a/block/blk-cbt.c
+++ b/block/blk-cbt.c
@@ -491,7 +491,7 @@  static int blk_cbt_snap_drop(struct request_queue *q, __u8 *uuid)
 	mutex_unlock(&cbt_mutex);
 	if (ret == 0)
 		free_map(map, npages);
-	return 0;
+	return ret;
 }
 
 static void blk_cbt_page_merge(struct page *pg_from, struct page *pg_to)
@@ -570,7 +570,7 @@  static int blk_cbt_snap_merge_back(struct request_queue *q, __u8 *uuid)
 	mutex_unlock(&cbt_mutex);
 	if (ret == 0)
 		free_map(map, NR_PAGES(block_max));
-	return 0;
+	return ret;
 }
 
 void blk_cbt_update_size(struct block_device *bdev)