diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-01 12:00:29 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-01 12:00:29 -0500 |
commit | b1bf9368407ae7e89d8a005bb40beb70a41df539 (patch) | |
tree | 3815c8aab19c6c186736673c624fef5f3faab716 /arch/um/drivers/ubd_kern.c | |
parent | 524df55725217b13d5a232fb5badb5846418ea0e (diff) | |
parent | 4671a1322052425afa38fcb7980d2fd2bb0fc99b (diff) |
Merge branch 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block
* 'for-2.6.34' of git://git.kernel.dk/linux-2.6-block: (38 commits)
block: don't access jiffies when initialising io_context
cfq: remove 8 bytes of padding from cfq_rb_root on 64 bit builds
block: fix for "Consolidate phys_segment and hw_segment limits"
cfq-iosched: quantum check tweak
blktrace: perform cleanup after setup error
blkdev: fix merge_bvec_fn return value checks
cfq-iosched: requests "in flight" vs "in driver" clarification
cciss: Fix problem with scatter gather elements in the scsi half of the driver
cciss: eliminate unnecessary pointer use in cciss scsi code
cciss: do not use void pointer for scsi hba data
cciss: factor out scatter gather chain block mapping code
cciss: fix scatter gather chain block dma direction kludge
cciss: simplify scatter gather code
cciss: factor out scatter gather chain block allocation and freeing
cciss: detect bad alignment of scsi commands at build time
cciss: clarify command list padding calculation
cfq-iosched: rethink seeky detection for SSDs
cfq-iosched: rework seeky detection
block: remove padding from io_context on 64bit builds
block: Consolidate phys_segment and hw_segment limits
...
Diffstat (limited to 'arch/um/drivers/ubd_kern.c')
-rw-r--r-- | arch/um/drivers/ubd_kern.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c index 5ff554677f40..c1ff6903b622 100644 --- a/arch/um/drivers/ubd_kern.c +++ b/arch/um/drivers/ubd_kern.c | |||
@@ -747,7 +747,7 @@ static int ubd_open_dev(struct ubd *ubd_dev) | |||
747 | ubd_dev->fd = fd; | 747 | ubd_dev->fd = fd; |
748 | 748 | ||
749 | if(ubd_dev->cow.file != NULL){ | 749 | if(ubd_dev->cow.file != NULL){ |
750 | blk_queue_max_sectors(ubd_dev->queue, 8 * sizeof(long)); | 750 | blk_queue_max_hw_sectors(ubd_dev->queue, 8 * sizeof(long)); |
751 | 751 | ||
752 | err = -ENOMEM; | 752 | err = -ENOMEM; |
753 | ubd_dev->cow.bitmap = vmalloc(ubd_dev->cow.bitmap_len); | 753 | ubd_dev->cow.bitmap = vmalloc(ubd_dev->cow.bitmap_len); |
@@ -849,7 +849,7 @@ static int ubd_add(int n, char **error_out) | |||
849 | } | 849 | } |
850 | ubd_dev->queue->queuedata = ubd_dev; | 850 | ubd_dev->queue->queuedata = ubd_dev; |
851 | 851 | ||
852 | blk_queue_max_hw_segments(ubd_dev->queue, MAX_SG); | 852 | blk_queue_max_segments(ubd_dev->queue, MAX_SG); |
853 | err = ubd_disk_register(UBD_MAJOR, ubd_dev->size, n, &ubd_gendisk[n]); | 853 | err = ubd_disk_register(UBD_MAJOR, ubd_dev->size, n, &ubd_gendisk[n]); |
854 | if(err){ | 854 | if(err){ |
855 | *error_out = "Failed to register device"; | 855 | *error_out = "Failed to register device"; |