diff options
| author | Jens Axboe <axboe@fb.com> | 2014-09-11 17:31:18 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-09-11 17:31:18 +0200 |
| commit | b207892b061da7608878e273ae22ba9bf9be264b (patch) | |
| tree | 51daa46b89b83cad422941f52110b19571b85b79 /block/blk-core.c | |
| parent | bdi: reimplement bdev_inode_switch_bdi() (diff) | |
| parent | blk-mq: scale depth and rq map appropriate if low on memory (diff) | |
| download | linux-b207892b061da7608878e273ae22ba9bf9be264b.tar.xz linux-b207892b061da7608878e273ae22ba9bf9be264b.zip | |
Merge branch 'for-linus' into for-3.18/core
A bit of churn on the for-linus side that would be nice to have
in the core bits for 3.18, so pull it in to catch us up and make
forward progress easier.
Signed-off-by: Jens Axboe <axboe@fb.com>
Conflicts:
block/scsi_ioctl.c
Diffstat (limited to 'block/blk-core.c')
| -rw-r--r-- | block/blk-core.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 817446175489..6946a4275e6f 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1248,7 +1248,6 @@ void blk_rq_set_block_pc(struct request *rq) rq->__sector = (sector_t) -1; rq->bio = rq->biotail = NULL; memset(rq->__cmd, 0, sizeof(rq->__cmd)); - rq->cmd = rq->__cmd; } EXPORT_SYMBOL(blk_rq_set_block_pc); |