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
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
block
/
nbd.c
diff --git
a/drivers/block/nbd.c
b/drivers/block/nbd.c
index
75ad39d
..
2f5cc3e
100644
(file)
--- a/
drivers/block/nbd.c
+++ b/
drivers/block/nbd.c
@@
-92,7
+92,7
@@
static struct nbd_device nbd_dev[MAX_NBD];
* a single lock.
* Thanks go to Jens Axboe and Al Viro for their LKML emails explaining this!
*/
* a single lock.
* Thanks go to Jens Axboe and Al Viro for their LKML emails explaining this!
*/
-static
spinlock_t nbd_lock = SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(nbd_lock)
;
#ifndef NDEBUG
static const char *ioctl_cmd_to_ascii(int cmd)
#ifndef NDEBUG
static const char *ioctl_cmd_to_ascii(int cmd)
@@
-726,6
+726,6
@@
MODULE_DESCRIPTION("Network Block Device");
MODULE_LICENSE("GPL");
#ifndef NDEBUG
MODULE_LICENSE("GPL");
#ifndef NDEBUG
-
MODULE_PARM(debugflags, "i"
);
+
module_param(debugflags, int, 0644
);
MODULE_PARM_DESC(debugflags, "flags for controlling debug output");
#endif
MODULE_PARM_DESC(debugflags, "flags for controlling debug output");
#endif