Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f75a4f8 authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[PATCH] uml ubd driver: give better names to some functions. 



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: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7d314e34

arch/um/drivers/ubd_kern.c

+6 −6
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ static int ubd_file_size(struct ubd *ubd_dev, __u64 *size_out) 
	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)
@@ -624,7 +624,7 @@ static int ubd_open_dev(struct ubd *ubd_dev) 
	return(err);

}



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)

			

{
@@ -676,12 +676,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 */
@@ -898,7 +898,7 @@ static int ubd_open(struct inode *inode, struct file *filp) 
	/* 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:
@@ -911,7 +911,7 @@ static int ubd_release(struct inode * inode, struct file * file) 
	struct ubd *ubd_dev = disk->private_data;



	if(--ubd_dev->count == 0)

		ubd_close(ubd_dev);

		ubd_close_dev(ubd_dev);

	return(0);

}