Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-16 13:34:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PATCH] uml ubd driver: convert do_ubd to a boolean variable

Browse Source 
do_ubd is actually just a boolean variable - the way it is used currently is a
leftover from the old 2.4 block layer, but it is still used; its use is
suspicious, but removing it would be too intrusive for now and needs more
thinking.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Paolo 'Blaisorblade' Giarrusso 2006-10-30 22:07:09 -08:00 committed by Linus Torvalds
parent 33f775eea1
commit 2fe30a34a1
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/um/drivers/ubd_kern.c
View File

@ -112,7 +112,9 @@ static DEFINE_SPINLOCK(ubd_io_lock);
static DEFINE_MUTEX(ubd_lock); static DEFINE_MUTEX(ubd_lock);
static void (*do_ubd)(void); /* XXX - this made sense in 2.4 days, now it's only used as a boolean, and
* probably it doesn't make sense even for that. */
static int do_ubd;
static int ubd_open(struct inode * inode, struct file * filp); static int ubd_open(struct inode * inode, struct file * filp);
static int ubd_release(struct inode * inode, struct file * file); static int ubd_release(struct inode * inode, struct file * file);
@ -508,6 +510,7 @@ static inline void ubd_finish(struct request *req, int error)
spin_unlock(&ubd_io_lock); spin_unlock(&ubd_io_lock);
} }
/* XXX - move this inside ubd_intr. */
/* Called without ubd_io_lock held, and only in interrupt context. */ /* Called without ubd_io_lock held, and only in interrupt context. */
static void ubd_handler(void) static void ubd_handler(void)
{ {
@ -515,7 +518,7 @@ static void ubd_handler(void)
struct request *rq = elv_next_request(ubd_queue); struct request *rq = elv_next_request(ubd_queue);
int n; int n;
do_ubd = NULL; do_ubd = 0;
intr_count++; intr_count++;
n = os_read_file(thread_fd, &req, sizeof(req)); n = os_read_file(thread_fd, &req, sizeof(req));
if(n != sizeof(req)){ if(n != sizeof(req)){
@ -1043,7 +1046,7 @@ static void do_ubd_request(request_queue_t *q)
return; return;
err = prepare_request(req, &io_req); err = prepare_request(req, &io_req);
if(!err){ if(!err){
do_ubd = ubd_handler; do_ubd = 1;
n = os_write_file(thread_fd, (char *) &io_req, n = os_write_file(thread_fd, (char *) &io_req,
sizeof(io_req)); sizeof(io_req));
if(n != sizeof(io_req)) if(n != sizeof(io_req))