|
@@ -582,12 +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)
|
|
|
+static inline bool blkif_request_flush_invalid(struct request *req,
|
|
|
+ struct blkfront_info *info)
|
|
|
{
|
|
|
return ((req->cmd_type != REQ_TYPE_FS) ||
|
|
|
- ((req->cmd_flags & (REQ_FLUSH | REQ_FUA)) &&
|
|
|
- !info->flush_op));
|
|
|
+ ((req->cmd_flags & REQ_FLUSH) &&
|
|
|
+ !(info->feature_flush & REQ_FLUSH)) ||
|
|
|
+ ((req->cmd_flags & REQ_FUA) &&
|
|
|
+ !(info->feature_flush & REQ_FUA)));
|
|
|
}
|
|
|
|
|
|
/*
|
|
@@ -612,8 +614,8 @@ static void do_blkif_request(struct request_queue *rq)
|
|
|
|
|
|
blk_start_request(req);
|
|
|
|
|
|
- if (blkif_request_flush_valid(req, info)) {
|
|
|
- __blk_end_request_all(req, -EIO);
|
|
|
+ if (blkif_request_flush_invalid(req, info)) {
|
|
|
+ __blk_end_request_all(req, -EOPNOTSUPP);
|
|
|
continue;
|
|
|
}
|
|
|
|