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

Commit 0f1ca65e authored by Arianna Avanzini's avatar Arianna Avanzini Committed by Konrad Rzeszutek Wilk
Browse files

xen, blkfront: factor out flush-related checks from do_blkif_request() 



This commit factors out some checks related to the request insertion
path, which can be done in an function instead of by itself.

Reviewed-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
Signed-off-by: default avatarArianna Avanzini <avanzini.arianna@gmail.com>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 61cecca8

drivers/block/xen-blkfront.c

+9 −3
Original line number Diff line number Diff line
@@ -582,6 +582,14 @@ static inline void flush_requests(struct blkfront_info *info) 
		notify_remote_via_irq(info->irq);

}



static inline bool blkif_request_flush_valid(struct request *req,

					     struct blkfront_info *info)

{

	return ((req->cmd_type != REQ_TYPE_FS) ||

		((req->cmd_flags & (REQ_FLUSH | REQ_FUA)) &&

		!info->flush_op));

}



/*

 * do_blkif_request

 *  read a block; request is in a request queue
@@ -604,9 +612,7 @@ static void do_blkif_request(struct request_queue *rq) 


		blk_start_request(req);



		if ((req->cmd_type != REQ_TYPE_FS) ||

		    ((req->cmd_flags & (REQ_FLUSH | REQ_FUA)) &&

		    !info->flush_op)) {

		if (blkif_request_flush_valid(req, info)) {

			__blk_end_request_all(req, -EIO);

			continue;

		}