evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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: David Vrabel <david.vrabel@citrix.com>
Signed-off-by: Arianna Avanzini <avanzini.arianna@gmail.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
This commit is contained in:
Arianna Avanzini 2014-08-22 13:20:02 +02:00 • committed by Konrad Rzeszutek Wilk
parent 61cecca865
commit 0f1ca65ee5
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/block/xen-blkfront.c
View file

@ -582,6 +582,14 @@ static inline void flush_requests(struct blkfront_info *info)
notify_remote_via_irq(info->irq); 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 * do_blkif_request
* read a block; request is in a request queue * 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); blk_start_request(req);
if ((req->cmd_type != REQ_TYPE_FS) || if (blkif_request_flush_valid(req, info)) {
((req->cmd_flags & (REQ_FLUSH | REQ_FUA)) &&
!info->flush_op)) {
__blk_end_request_all(req, -EIO); __blk_end_request_all(req, -EIO);
continue; continue;
} }