net: s2io: simplify logical constraint

[deliverable/linux.git] / drivers / md / dm-zero.c

diff --git a/drivers/md/dm-zero.c b/drivers/md/dm-zero.c
index 766bc93006e616758fef0f37397a8cf5126bea3a..618b8752dcf1479733764592930902232ec47b27 100644 (file)
--- a/drivers/md/dm-zero.c
+++ b/drivers/md/dm-zero.c
@@ -35,16 +35,19 @@ static int zero_ctr(struct dm_target *ti, unsigned int argc, char **argv)
  */
 static int zero_map(struct dm_target *ti, struct bio *bio)
 {
-       switch(bio_rw(bio)) {
-       case READ:
+       switch (bio_op(bio)) {
+       case REQ_OP_READ:
+               if (bio->bi_rw & REQ_RAHEAD) {
+                       /* readahead of null bytes only wastes buffer cache */
+                       return -EIO;
+               }
                zero_fill_bio(bio);
                break;
-       case READA:
-               /* readahead of null bytes only wastes buffer cache */
-               return -EIO;
-       case WRITE:
+       case REQ_OP_WRITE:
                /* writes get silently dropped */
                break;
+       default:
+               return -EIO;
        }
 
        bio_endio(bio);