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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
fs
/
partitions
/
devfs.c
diff --git
a/fs/partitions/devfs.c
b/fs/partitions/devfs.c
index
3f0a780
..
87f5044
100644
(file)
--- a/
fs/partitions/devfs.c
+++ b/
fs/partitions/devfs.c
@@
-6,7
+6,7
@@
#include <linux/vmalloc.h>
#include <linux/genhd.h>
#include <linux/bitops.h>
#include <linux/vmalloc.h>
#include <linux/genhd.h>
#include <linux/bitops.h>
-#include <
linux/mutex
.h>
+#include <
asm/semaphore
.h>
struct unique_numspace {
struct unique_numspace {
@@
-16,7
+16,7
@@
struct unique_numspace {
struct semaphore mutex;
};
struct semaphore mutex;
};
-static DE
FIN
E_MUTEX(numspace_mutex);
+static DE
CLAR
E_MUTEX(numspace_mutex);
static int expand_numspace(struct unique_numspace *s)
{
static int expand_numspace(struct unique_numspace *s)
{
@@
-48,7
+48,7
@@
static int alloc_unique_number(struct unique_numspace *s)
{
int rval = 0;
{
int rval = 0;
-
mutex_lock
(&numspace_mutex);
+
down
(&numspace_mutex);
if (s->num_free < 1)
rval = expand_numspace(s);
if (!rval) {
if (s->num_free < 1)
rval = expand_numspace(s);
if (!rval) {
@@
-56,7
+56,7
@@
static int alloc_unique_number(struct unique_numspace *s)
--s->num_free;
__set_bit(rval, s->bits);
}
--s->num_free;
__set_bit(rval, s->bits);
}
-
mutex_unlock
(&numspace_mutex);
+
up
(&numspace_mutex);
return rval;
}
return rval;
}
@@
-66,11
+66,11
@@
static void dealloc_unique_number(struct unique_numspace *s, int number)
int old_val;
if (number >= 0) {
int old_val;
if (number >= 0) {
-
mutex_lock
(&numspace_mutex);
+
down
(&numspace_mutex);
old_val = __test_and_clear_bit(number, s->bits);
if (old_val)
++s->num_free;
old_val = __test_and_clear_bit(number, s->bits);
if (old_val)
++s->num_free;
-
mutex_unlock
(&numspace_mutex);
+
up
(&numspace_mutex);
}
}
}
}