lkml.org 
[lkml]   [2007]   [Aug]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 04/28] uml: fix previous request size limit fix
    -stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Jeff Dike <jdike@addtoit.com>

    The previous patch which limited the number of sectors in a single request
    to a COWed device was correct in concept, but the limit was implemented in
    the wrong place.

    By putting it in ubd_add, it covered the cases where the COWing was
    specified on the command line. However, when the command line only has the
    COW file specified, the fact that it's a COW file isn't known until it's
    opened, so the limit is missed in these cases.

    This patch moves the sector limit from ubd_add to ubd_open_dev.

    Signed-off-by: Jeff Dike <jdike@linux.intel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    arch/um/drivers/ubd_kern.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/arch/um/drivers/ubd_kern.c
    +++ b/arch/um/drivers/ubd_kern.c
    @@ -612,6 +612,8 @@ static int ubd_open_dev(struct ubd *ubd_
    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_o
    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";
    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-08-24 00:31    [W:3.614 / U:0.388 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site