The patch titled
uml ubd driver: convert do_ubd to a boolean variable
has been removed from the -mm tree. Its filename was
uml-ubd-driver-convert-do_ubd-to-a-boolean-variable.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: uml ubd driver: convert do_ubd to a boolean variable
From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
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@xxxxxxxx>
Cc: Jeff Dike <jdike@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/um/drivers/ubd_kern.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff -puN arch/um/drivers/ubd_kern.c~uml-ubd-driver-convert-do_ubd-to-a-boolean-variable arch/um/drivers/ubd_kern.c
--- a/arch/um/drivers/ubd_kern.c~uml-ubd-driver-convert-do_ubd-to-a-boolean-variable
+++ a/arch/um/drivers/ubd_kern.c
@@ -112,7 +112,9 @@ static DEFINE_SPINLOCK(ubd_io_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_release(struct inode * inode, struct file * file);
@@ -508,6 +510,7 @@ static inline void ubd_finish(struct req
spin_unlock(&ubd_io_lock);
}
+/* XXX - move this inside ubd_intr. */
/* Called without ubd_io_lock held, and only in interrupt context. */
static void ubd_handler(void)
{
@@ -515,7 +518,7 @@ static void ubd_handler(void)
struct request *rq = elv_next_request(ubd_queue);
int n;
- do_ubd = NULL;
+ do_ubd = 0;
intr_count++;
n = os_read_file(thread_fd, &req, sizeof(req));
if(n != sizeof(req)){
@@ -1052,7 +1055,7 @@ static void do_ubd_request(request_queue
return;
err = prepare_request(req, &io_req);
if(!err){
- do_ubd = ubd_handler;
+ do_ubd = 1;
n = os_write_file(thread_fd, (char *) &io_req,
sizeof(io_req));
if(n != sizeof(io_req))
_
Patches currently in -mm which might be from blaisorblade@xxxxxxxx are
origin.patch
make-x86_64-udelay-round-up-instead-of-down.patch
i386-x86_64-comment-magic-constants-in-delayh.patch
uml-fix-prototypes.patch
uml-make-execvp-safe-for-our-usage.patch
tty-switch-to-ktermios-uml-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
