patch-2.3.1 linux/fs/lockd/svcsubs.c

Next file: linux/fs/locks.c
Previous file: linux/fs/lockd/svc.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.0/linux/fs/lockd/svcsubs.c linux/fs/lockd/svcsubs.c
@@ -26,7 +26,7 @@
 #define FILE_NRHASH		32
 #define FILE_HASH_BITS		5
 static struct nlm_file *	nlm_files[FILE_NRHASH];
-static struct semaphore		nlm_file_sema = MUTEX;
+static DECLARE_MUTEX(nlm_file_sema);
 static unsigned int file_hash(dev_t dev, ino_t ino)
@@ -76,7 +76,7 @@
 	memset(file, 0, sizeof(*file));
 	file->f_handle = *fh;
-	file->f_sema   = MUTEX;
+	init_MUTEX(&file->f_sema);
 	/* Open the file. Note that this must not sleep for too long, else
 	 * we would lock up lockd:-) So no NFS re-exports, folks.

TCL-scripts by Sam Shen (who was at: