git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
block
/
swim_iop.c
diff --git
a/drivers/block/swim_iop.c
b/drivers/block/swim_iop.c
index
283c5b6
..
89e3c2f
100644
(file)
--- a/
drivers/block/swim_iop.c
+++ b/
drivers/block/swim_iop.c
@@
-76,7
+76,7
@@
static struct swim_iop_req *current_req;
static int floppy_count;
static struct floppy_state floppy_states[MAX_FLOPPIES];
static int floppy_count;
static struct floppy_state floppy_states[MAX_FLOPPIES];
-static
spinlock_t swim_iop_lock = SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(swim_iop_lock)
;
#define CURRENT elv_next_request(swim_queue)
#define CURRENT elv_next_request(swim_queue)
@@
-338,8
+338,7
@@
static int swimiop_eject(struct floppy_state *fs)
err = -EINTR;
break;
}
err = -EINTR;
break;
}
- current->state = TASK_INTERRUPTIBLE;
- schedule_timeout(1);
+ schedule_timeout_interruptible(1);
}
release_drive(fs);
return cmd->error;
}
release_drive(fs);
return cmd->error;