patch-2.3.1 linux/fs/ncpfs/inode.c

Next file: linux/fs/nfs/dir.c
Previous file: linux/fs/ncpfs/dir.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.0/linux/fs/ncpfs/inode.c linux/fs/ncpfs/inode.c
@@ -57,7 +57,7 @@
 #endif
 
 static struct nw_file_info *read_nwinfo = NULL;
-static struct semaphore read_sem = MUTEX;
+static DECLARE_MUTEX(read_sem);
 
 /*
  * Fill in the ncpfs-specific information in the inode.
@@ -350,7 +350,7 @@
 
 	server->ncp_filp = ncp_filp;
 	server->lock = 0;
-	server->wait = NULL;
+	init_waitqueue_head(&server->wait);
 	server->packet = NULL;
 	server->buffer_size = 0;
 	server->conn_status = 0;
@@ -723,7 +723,7 @@
 {
 	DPRINTK(KERN_DEBUG "ncpfs: init_module called\n");
 
-	read_sem = MUTEX;
+	init_MUTEX(&read_sem);
 	read_nwinfo = NULL;
 
 #ifdef DEBUG_NCP_MALLOC

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)