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

Commit d842a93c authored by Jiri Slaby's avatar Jiri Slaby Committed by James Bottomley
Browse files

[SCSI] fix bio.bi_rw handling 



Return of the bi_rw tests is no longer bool after commit 74450be1. So
testing against constants doesn't make sense anymore. Fix this bug in
osd_req_read by removing "== 1" in test.

This is not a problem now, where REQ_WRITE is 1, but this can change
in the future and we don't want to rely on that.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 2bfc96a1

drivers/scsi/osd/osd_initiator.c

+1 −1
Original line number Diff line number Diff line
@@ -865,7 +865,7 @@ void osd_req_read(struct osd_request *or, 
{

	_osd_req_encode_common(or, OSD_ACT_READ, obj, offset, len);

	WARN_ON(or->in.bio || or->in.total_bytes);

	WARN_ON(1 == (bio->bi_rw & REQ_WRITE));

	WARN_ON(bio->bi_rw & REQ_WRITE);

	or->in.bio = bio;

	or->in.total_bytes = len;

}