lkml.org 
[lkml]   [2006]   [Oct]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/11] uml ubd driver: give better names to some functions.
    Date
    From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

    To rethink locking, I needed to understand well what each function does. While
    doing this I renamed some:

    * ubd_close -> ubd_close_dev (since it pairs with ubd_open_dev)

    * ubd_new_disk -> ubd_disk_register (it handles registration with the block
    layer - one hopes this makes clearer the difference with ubd_add())

    Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
    ---

    arch/um/drivers/ubd_kern.c | 12 ++++++------
    1 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
    index 50385cc..23663b7 100644
    --- a/arch/um/drivers/ubd_kern.c
    +++ b/arch/um/drivers/ubd_kern.c
    @@ -552,7 +552,7 @@ static int ubd_file_size(struct ubd *ubd
    return(os_file_size(file, size_out));
    }

    -static void ubd_close(struct ubd *ubd_dev)
    +static void ubd_close_dev(struct ubd *ubd_dev)
    {
    os_close_file(ubd_dev->fd);
    if(ubd_dev->cow.file == NULL)
    @@ -629,7 +629,7 @@ static void dummy_device_release(struct
    {
    }

    -static int ubd_new_disk(int major, u64 size, int unit,
    +static int ubd_disk_register(int major, u64 size, int unit,
    struct gendisk **disk_out)

    {
    @@ -682,12 +682,12 @@ static int ubd_add(int n)

    ubd_dev->size = ROUND_BLOCK(ubd_dev->size);

    - err = ubd_new_disk(MAJOR_NR, ubd_dev->size, n, &ubd_gendisk[n]);
    + err = ubd_disk_register(MAJOR_NR, ubd_dev->size, n, &ubd_gendisk[n]);
    if(err)
    goto out;

    if(fake_major != MAJOR_NR)
    - ubd_new_disk(fake_major, ubd_dev->size, n,
    + ubd_disk_register(fake_major, ubd_dev->size, n,
    &fake_gendisk[n]);

    /* perhaps this should also be under the "if (fake_major)" above */
    @@ -904,7 +904,7 @@ static int ubd_open(struct inode *inode,
    /* This should no more be needed. And it didn't work anyway to exclude
    * read-write remounting of filesystems.*/
    /*if((filp->f_mode & FMODE_WRITE) && !ubd_dev->openflags.w){
    - if(--ubd_dev->count == 0) ubd_close(ubd_dev);
    + if(--ubd_dev->count == 0) ubd_close_dev(ubd_dev);
    err = -EROFS;
    }*/
    out:
    @@ -917,7 +917,7 @@ static int ubd_release(struct inode * in
    struct ubd *ubd_dev = disk->private_data;

    if(--ubd_dev->count == 0)
    - ubd_close(ubd_dev);
    + ubd_close_dev(ubd_dev);
    return(0);
    }

    Chiacchiera con i tuoi amici in tempo reale!
    http://it.yahoo.com/mail_it/foot/*http://it.messenger.yahoo.com
    -
    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: 2006-10-29 20:27    [W:0.035 / U:29.892 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site