Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31c4ccc3 authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

xen-blkfront: Fix handling of non-supported operations 



This patch fixes the following sparse warnings:

drivers/block/xen-blkfront.c:916:45: warning: incorrect type in argument 2 (different base types)
drivers/block/xen-blkfront.c:916:45:    expected restricted blk_status_t [usertype] error
drivers/block/xen-blkfront.c:916:45:    got int [signed] error
drivers/block/xen-blkfront.c:1599:47: warning: incorrect type in assignment (different base types)
drivers/block/xen-blkfront.c:1599:47:    expected int [signed] error
drivers/block/xen-blkfront.c:1599:47:    got restricted blk_status_t [usertype] <noident>
drivers/block/xen-blkfront.c:1607:55: warning: incorrect type in assignment (different base types)
drivers/block/xen-blkfront.c:1607:55:    expected int [signed] error
drivers/block/xen-blkfront.c:1607:55:    got restricted blk_status_t [usertype] <noident>
drivers/block/xen-blkfront.c:1625:55: warning: incorrect type in assignment (different base types)
drivers/block/xen-blkfront.c:1625:55:    expected int [signed] error
drivers/block/xen-blkfront.c:1625:55:    got restricted blk_status_t [usertype] <noident>
drivers/block/xen-blkfront.c:1628:62: warning: restricted blk_status_t degrades to integer

Compile-tested only.

Fixes: commit 2a842aca ("block: introduce new block status code type")
Signed-off-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Roger Pau Monné <roger.pau@citrix.com>
Cc: <xen-devel@lists.xenproject.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent a7ee8cf1

drivers/block/xen-blkfront.c

+2 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ struct blk_shadow { 
};



struct blkif_req {

	int	error;

	blk_status_t	error;

};



static inline struct blkif_req *blkif_req(struct request *rq)
@@ -1616,7 +1616,7 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id) 
			if (unlikely(bret->status == BLKIF_RSP_EOPNOTSUPP)) {

				printk(KERN_WARNING "blkfront: %s: %s op failed\n",

				       info->gd->disk_name, op_name(bret->operation));

				blkif_req(req)->error = -EOPNOTSUPP;

				blkif_req(req)->error = BLK_STS_NOTSUPP;

			}

			if (unlikely(bret->status == BLKIF_RSP_ERROR &&

				     rinfo->shadow[id].req.u.rw.nr_segments == 0)) {