patch-2.4.0-test2 linux/net/netlink/netlink_dev.c

Next file: linux/net/netsyms.c
Previous file: linux/net/irda/irmod.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test1/linux/net/netlink/netlink_dev.c linux/net/netlink/netlink_dev.c
@@ -114,7 +114,6 @@
 		return -EBUSY;
 
 	open_map |= (1<<minor);
-	MOD_INC_USE_COUNT;
 
 	err = sock_create(PF_NETLINK, SOCK_RAW, minor, &sock);
 	if (err < 0)
@@ -133,7 +132,6 @@
 
 out:
 	open_map &= ~(1<<minor);
-	MOD_DEC_USE_COUNT;
 	return err;
 }
 
@@ -145,7 +143,6 @@
 	netlink_user[minor] = NULL;
 	open_map &= ~(1<<minor);
 	sock_release(sock);
-	MOD_DEC_USE_COUNT;
 	return 0;
 }
 
@@ -167,6 +164,7 @@
 
 
 static struct file_operations netlink_fops = {
+	owner:		THIS_MODULE,
 	llseek:		netlink_lseek,
 	read:		netlink_read,
 	write:		netlink_write,
@@ -180,9 +178,9 @@
 
 static void __init make_devfs_entries (const char *name, int minor)
 {
-	devfs_register (devfs_handle, name, 0, DEVFS_FL_DEFAULT,
+	devfs_register (devfs_handle, name, DEVFS_FL_DEFAULT,
 			NETLINK_MAJOR, minor,
-			S_IFCHR | S_IRUSR | S_IWUSR, 0, 0,
+			S_IFCHR | S_IRUSR | S_IWUSR,
 			&netlink_fops, NULL);
 }
 
@@ -203,7 +201,7 @@
 	make_devfs_entries ("IP6_FW", 13);
 	devfs_register_series (devfs_handle, "tap%u", 16, DEVFS_FL_DEFAULT,
 			       NETLINK_MAJOR, 16,
-			       S_IFCHR | S_IRUSR | S_IWUSR, 0, 0,
+			       S_IFCHR | S_IRUSR | S_IWUSR,
 			       &netlink_fops, NULL);
 	return 0;
 }

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