projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
[cascardo/linux.git]
/
drivers
/
mtd
/
mtd_blkdevs.c
diff --git
a/drivers/mtd/mtd_blkdevs.c
b/drivers/mtd/mtd_blkdevs.c
index
458d3c8
..
178b53b
100644
(file)
--- a/
drivers/mtd/mtd_blkdevs.c
+++ b/
drivers/mtd/mtd_blkdevs.c
@@
-46,7
+46,7
@@
static int do_blktrans_request(struct mtd_blktrans_ops *tr,
nsect = req->current_nr_sectors;
buf = req->buffer;
nsect = req->current_nr_sectors;
buf = req->buffer;
- if (!
(req->flags & REQ_CMD
))
+ if (!
blk_fs_request(req
))
return 0;
if (block + nsect > get_capacity(req->rq_disk))
return 0;
if (block + nsect > get_capacity(req->rq_disk))
@@
-69,7
+69,7
@@
static int do_blktrans_request(struct mtd_blktrans_ops *tr,
return 1;
default:
return 1;
default:
- printk(KERN_NOTICE "Unknown request %
ld
\n", rq_data_dir(req));
+ printk(KERN_NOTICE "Unknown request %
u
\n", rq_data_dir(req));
return 0;
}
}
return 0;
}
}