diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 10:50:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 10:50:19 -0700 |
| commit | e245befce7af0a1e1347079ed62695b059594bd4 (patch) | |
| tree | 08270a503c8945b4e6ba142728dc289de2b55542 /drivers/block | |
| parent | 14dc5249728ff699b1ca4dac01ad416a350a147a (diff) | |
| parent | 58ff411e0d21592565ac9ab34f33a434f26e018b (diff) | |
| download | linux-3.10-e245befce7af0a1e1347079ed62695b059594bd4.tar.gz linux-3.10-e245befce7af0a1e1347079ed62695b059594bd4.tar.bz2 linux-3.10-e245befce7af0a1e1347079ed62695b059594bd4.zip | |
Merge branch 'bsg' of git://git.kernel.dk/data/git/linux-2.6-block
* 'bsg' of git://git.kernel.dk/data/git/linux-2.6-block: (25 commits)
bsg: Kconfig updates
bsg: add SCSI transport-level request support
bsg: add bidi support
add a struct request pointer to the request structure
bsg: fix the deadlock on discarding done commands
bsg: fix a blocking read bug
bsg: minor bug fixes
improve bsg device allocation
bind bsg to all SCSI devices
bsg: bind bsg to request_queue instead of gendisk
bsg: add a request_queue argument to scsi_cmd_ioctl()
bsg: simplify __bsg_alloc_command failpath
bsg: add cheasy error checks for sysfs stuff
Add queue resizing support
Replace s32, u32 and u64 with __s32, __u32 and __u64 in bsg.h for userspace
bsg: silence a bogus gcc warning
bsg: style cleanup
bsg: use u32 etc instead of uint32_t
bsg: add SG_IO to SG v4
bsg: replace SG v3 with SG v4
...
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/ub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/ub.c b/drivers/block/ub.c index 18c8b6c0db2..8b13d7d2cb6 100644 --- a/drivers/block/ub.c +++ b/drivers/block/ub.c @@ -1709,7 +1709,7 @@ static int ub_bd_ioctl(struct inode *inode, struct file *filp, struct gendisk *disk = inode->i_bdev->bd_disk; void __user *usermem = (void __user *) arg; - return scsi_cmd_ioctl(filp, disk, cmd, usermem); + return scsi_cmd_ioctl(filp, disk->queue, disk, cmd, usermem); } /* |