patch-2.4.0-test9 linux/fs/lockd/xdr4.c

• Lines: 25
• Date: Thu Sep 21 13:38:59 2000
• Orig file: v2.4.0-test8/linux/fs/lockd/xdr4.c
• Orig date: Mon Apr 10 23:02:45 2000

diff -u --recursive --new-file v2.4.0-test8/linux/fs/lockd/xdr4.c linux/fs/lockd/xdr4.c
@@ -131,7 +131,7 @@
 	 || !(p = nlm4_decode_oh(p, &lock->oh)))
 		return NULL;
 
-	memset(fl, 0, sizeof(*fl));
+	locks_init_lock(fl);
 	fl->fl_owner = current->files;
 	fl->fl_pid   = ntohl(*p++);
 	fl->fl_flags = FL_POSIX;
@@ -322,6 +322,7 @@
 	int		len;
 
 	memset(lock, 0, sizeof(*lock));
+	locks_init_lock(&lock->fl);
 	lock->fl.fl_pid = ~(u32) 0;
 
 	if (!(p = nlm4_decode_cookie(p, &argp->cookie))
@@ -438,6 +439,7 @@
 		s64			start, end, len;
 
 		memset(&resp->lock, 0, sizeof(resp->lock));
+		locks_init_lock(fl);
 		excl = ntohl(*p++);
 		fl->fl_pid = ntohl(*p++);
 		if (!(p = nlm4_decode_oh(p, &resp->lock.oh)))