diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 17:18:03 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 17:18:03 +0200 |
| commit | bd5d435a96837c3495e62eef37cbe4cb728b79ae (patch) | |
| tree | 82aacaf5a1d220910c4b0a1088d7d2482c0d9ee0 /drivers/block/nbd.c | |
| parent | bitops: remove "optimizations" (diff) | |
| parent | block: Skip I/O merges when disabled (diff) | |
| download | linux-bd5d435a96837c3495e62eef37cbe4cb728b79ae.tar.xz linux-bd5d435a96837c3495e62eef37cbe4cb728b79ae.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
block: Skip I/O merges when disabled
block: add large command support
block: replace sizeof(rq->cmd) with BLK_MAX_CDB
ide: use blk_rq_init() to initialize the request
block: use blk_rq_init() to initialize the request
block: rename and export rq_init()
block: no need to initialize rq->cmd with blk_get_request
block: no need to initialize rq->cmd in prepare_flush_fn hook
block/blk-barrier.c:blk_ordered_cur_seq() mustn't be inline
block/elevator.c:elv_rq_merge_ok() mustn't be inline
block: make queue flags non-atomic
block: add dma alignment and padding support to blk_rq_map_kern
unexport blk_max_pfn
ps3disk: Remove superfluous cast
block: make rq_init() do a full memset()
relay: fix splice problem
Diffstat (limited to 'drivers/block/nbd.c')
| -rw-r--r-- | drivers/block/nbd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index bdba282f15e4..ad98dda6037d 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -577,6 +577,7 @@ static int nbd_ioctl(struct inode *inode, struct file *file, switch (cmd) { case NBD_DISCONNECT: printk(KERN_INFO "%s: NBD_DISCONNECT\n", lo->disk->disk_name); + blk_rq_init(NULL, &sreq); sreq.cmd_type = REQ_TYPE_SPECIAL; nbd_cmd(&sreq) = NBD_CMD_DISC; /* |