diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2010-08-12 14:31:05 +0200 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-09-02 22:11:55 +0200 |
| commit | d842a93c4b3a20d31f4fb97357e0964210d6066f (patch) | |
| tree | c7378b4df7e8577ccaded28cf433a292106f73fa /drivers/scsi/osd | |
| parent | Linux 2.6.36-rc3 (diff) | |
| download | linux-d842a93c4b3a20d31f4fb97357e0964210d6066f.tar.xz linux-d842a93c4b3a20d31f4fb97357e0964210d6066f.zip | |
[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: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/osd')
| -rw-r--r-- | drivers/scsi/osd/osd_initiator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c index fda4de3440c4..e88bbdde49c5 100644 --- a/drivers/scsi/osd/osd_initiator.c +++ b/drivers/scsi/osd/osd_initiator.c @@ -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; } |