diff options
| author | Arianna Avanzini <[email protected]> | 2014-08-22 13:20:02 +0200 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <[email protected]> | 2014-10-01 16:32:39 -0400 |
| commit | 0f1ca65ee50df042051e8fa3a14f73b0c71d45b9 (patch) | |
| tree | 65f3193a8a9c63a1af56d48d32d723634c9d9707 | |
| parent | 61cecca865280bef4f8a9748d0a9afa5df351ac2 (diff) | |
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: David Vrabel <[email protected]>
Signed-off-by: Arianna Avanzini <[email protected]>
Signed-off-by: Konrad Rzeszutek Wilk <[email protected]>
| -rw-r--r-- | drivers/block/xen-blkfront.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index 5deb235bd18f..6fc056ed1efd 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c @@ -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; } |