From b2c334c7f535fc93e0e3fd92874cfe87c9d6fc4f Mon Sep 17 00:00:00 2001 From: Jeff Dike Date: Wed, 22 Aug 2007 14:01:53 -0700 Subject: [PATCH] --- yaml --- r: 64258 b: refs/heads/master c: f4768ffd1d4b7b07ae2c4c3d93c9f99cd68e996c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/um/drivers/ubd_kern.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 14e94316f2a2..de61f9de266b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a88aa7865bc1d1d451af2d585ac0119164ce8e00 +refs/heads/master: f4768ffd1d4b7b07ae2c4c3d93c9f99cd68e996c diff --git a/trunk/arch/um/drivers/ubd_kern.c b/trunk/arch/um/drivers/ubd_kern.c index aff661fe2ee1..0eabe73c964d 100644 --- a/trunk/arch/um/drivers/ubd_kern.c +++ b/trunk/arch/um/drivers/ubd_kern.c @@ -612,6 +612,8 @@ static int ubd_open_dev(struct ubd *ubd_dev) ubd_dev->fd = fd; if(ubd_dev->cow.file != NULL){ + blk_queue_max_sectors(ubd_dev->queue, 8 * sizeof(long)); + err = -ENOMEM; ubd_dev->cow.bitmap = (void *) vmalloc(ubd_dev->cow.bitmap_len); if(ubd_dev->cow.bitmap == NULL){ @@ -712,8 +714,6 @@ static int ubd_add(int n, char **error_out) ubd_dev->queue->queuedata = ubd_dev; blk_queue_max_hw_segments(ubd_dev->queue, MAX_SG); - if(ubd_dev->cow.file != NULL) - blk_queue_max_sectors(ubd_dev->queue, 8 * sizeof(long)); err = ubd_disk_register(MAJOR_NR, ubd_dev->size, n, &ubd_gendisk[n]); if(err){ *error_out = "Failed to register device";