netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: netdev@vger.kernel.org,
	Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
Subject: [v2 066/115] sysctl: rename ->used to ->ctl_use_refs
Date: Mon,  9 May 2011 00:39:18 +0200	[thread overview]
Message-ID: <1304894407-32201-67-git-send-email-lucian.grijincu@gmail.com> (raw)
In-Reply-To: <1304894407-32201-1-git-send-email-lucian.grijincu@gmail.com>

In a later patch I will split the 'count' counter. We need to have a
clear distinction between the three counters to be able to understand
the code.

This counts the number of references to this object from places that
can tinker with it's internals (e.g. ctl_table, ctl_entry,
attached_to, attached_by, etc.).

Signed-off-by: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
---
 include/linux/sysctl.h |    4 +++-
 kernel/sysctl.c        |    9 ++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 1c41dbd..fe13067 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -1043,7 +1043,9 @@ struct ctl_table_header
 		struct {
 			struct ctl_table *ctl_table;
 			struct list_head ctl_entry;
-			int used;
+			/* references to this header from contexts that
+			 * can access fields of this header */
+			int ctl_use_refs;
 			int count;
 		};
 		struct rcu_head rcu;
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 8b56695..ab242b4 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1494,14 +1494,14 @@ static int use_table(struct ctl_table_header *p)
 {
 	if (unlikely(p->unregistering))
 		return 0;
-	p->used++;
+	p->ctl_use_refs++;
 	return 1;
 }
 
 /* called under sysctl_lock */
 static void unuse_table(struct ctl_table_header *p)
 {
-	if (!--p->used)
+	if (!--p->ctl_use_refs)
 		if (unlikely(p->unregistering))
 			complete(p->unregistering);
 }
@@ -1510,10 +1510,10 @@ static void unuse_table(struct ctl_table_header *p)
 static void start_unregistering(struct ctl_table_header *p)
 {
 	/*
-	 * if p->used is 0, nobody will ever touch that entry again;
+	 * if p->ctl_use_refs is 0, nobody will ever touch that entry again;
 	 * we'll eliminate all paths to it before dropping sysctl_lock
 	 */
-	if (unlikely(p->used)) {
+	if (unlikely(p->ctl_use_refs)) {
 		struct completion wait;
 		init_completion(&wait);
 		p->unregistering = &wait;
@@ -1875,7 +1875,6 @@ struct ctl_table_header *__register_sysctl_paths(
 	header->ctl_table_arg = table;
 
 	INIT_LIST_HEAD(&header->ctl_entry);
-	header->used = 0;
 	header->unregistering = NULL;
 	header->root = root;
 	header->count = 1;
-- 
1.7.5.134.g1c08b

  parent reply	other threads:[~2011-05-08 22:39 UTC|newest]

Thread overview: 100+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-08 22:38 [v2 000/115] faster tree-based sysctl implementation Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 001/115] sysctl: remove .child from dev/parport/default Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 002/115] sysctl: parport: reorder .child assignments to simplify review Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 003/115] sysctl: remove .child from dev/parport/PORT/devices/DEVICE Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 004/115] sysctl: remove .child from dev/parport/PORT/ Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 005/115] sysctl: remove .child from dev/parport/PORT/devices/ Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 006/115] sysctl: remove .child from kernel/vsyscall64 (x86) Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 007/115] sysctl: remove .child from abi/vsyscall32 (x86) Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 008/115] sysctl: remove .child from crypto/fips_enabled Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 009/115] sysctl: remove .child from dev/cdrom/ Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 010/115] sysctl: remove .child from dev/hpet/ Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 011/115] sysctl: remove .child from dev/ipmi/ Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 012/115] sysctl: remove .child from dev/rtc/ Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 013/115] sysctl: remove .child from dev/mac_hid/ Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 014/115] sysctl: remove .child from dev/raid/ Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 015/115] sysctl: remove .child from xpc/ Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 016/115] sysctl: remove .child from xpc/hb Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 017/115] sysctl: remove .child from kernel/sclp (s390) Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 018/115] sysctl: remove .child from dev/scsi Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 019/115] sysctl: remove .child from kernel/pty Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 020/115] sysctl: remove .child from coda/ Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 021/115] sysctl: remove .child from fscache/ Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 022/115] sysctl: remove .child from fs/nfs/ nlm_table table Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 023/115] sysctl: remove .child from fs/nfs/ nfs_cb_table Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 024/115] sysctl: remove .child from fs/ntfs-debug Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 025/115] sysctl: remove .child from fs/ocfs2/nm/ Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 026/115] sysctl: remove .child from fs/quota/ Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 027/115] sysctl: remove .child from fs/xfs/ Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 028/115] sysctl: remove .child from kernel/ (ipc) Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 029/115] sysctl: remove .child from fs/mqueue Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 030/115] sysctl: sched: add sd_table_template Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 031/115] sysctl: remove .child from kernel/sched_domain/cpuX/domainY/ Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 032/115] sysctl: remove .child from kernel/ (utsname) Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 033/115] sysctl: remove .child from sunrpc/ Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 034/115] sysctl: remove .child from sunrpc/svc_rdma Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 035/115] sysctl: remove .child from sunrpc/ (xprtrdma) Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 036/115] sysctl: remove .child from sunrpc/ (xprtsock) Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 037/115] sysctl: remove .child from bus/isa/ (arm) Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 038/115] sysctl: remove .child from reboot/warm (arm) Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 039/115] sysctl: remove .child from lasat/ (mips) Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 040/115] sysctl: remove .child from appldata/ (s390) Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 041/115] sysctl: remove .child from s390dbf/ Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 042/115] sysctl: remove .child from vm/ (s390) Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 043/115] sysctl: remove .child from kernel/perfmon/ (ia64) Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 044/115] sysctl: remove .child from kernel/ (ia64/kdump) Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 045/115] sysctl: remove .child from kernel/powersave-nap (powerpc) Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 046/115] sysctl: remove .child from pm/ (frv) Lucian Adrian Grijincu
2011-05-08 22:38 ` [v2 047/115] sysctl: remove .child from frv/ Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 048/115] sysctl: remove .child from sh64/unaligned_fixup/ Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 049/115] sysctl: delete unused register_sysctl_table function Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 050/115] sysctl: remove .child from ax25 table Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 051/115] sysctl: remove .child from net/ipv4/route and net/ipv4/neigh tables Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 052/115] sysctl: remove .child from net/ipv4/neigh table Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 053/115] sysctl: remove .child from net/ipv6/route, net/ipv6/icmp, net/ipv6 tables Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 054/115] sysctl: remove .child from net/llc tables Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 055/115] sysctl: call sysctl_init before the first sysctl registration Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 056/115] sysctl: no-child: manually register kernel/random Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 057/115] sysctl: no-child: manually register kernel/keys Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 058/115] sysctl: no-child: manually register fs/inotify Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 059/115] sysctl: no-child: manually register fs/epoll Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 060/115] sysctl: no-child: manually register root tables Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 061/115] sysctl: faster reimplementation of sysctl_check_table Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 062/115] sysctl: remove useless ctl_table->parent field Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 063/115] sysctl: simplify find_in_table Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 064/115] sysctl: sysctl_head_grab defaults to root header on NULL Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 065/115] sysctl: delete useless grab_header function Lucian Adrian Grijincu
2011-05-08 22:39 ` Lucian Adrian Grijincu [this message]
2011-05-08 22:39 ` [v2 067/115] sysctl: rename sysctl_head_grab/finish to sysctl_use_header/unuse Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 068/115] sysctl: rename sysctl_head_next to sysctl_use_next_header Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 069/115] sysctl: split ->count into ctl_procfs_refs and ctl_header_refs Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 070/115] sysctl: rename sysctl_head_get/put to sysctl_proc_inode_get/put Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 071/115] sysctl: rename (un)use_table to __sysctl_(un)use_header Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 072/115] sysctl: simplify ->permissions hook Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 073/115] sysctl: group root-specific operations Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 074/115] sysctl: introduce ctl_table_group Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 075/115] sysctl: move removal from list out of start_unregistering Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 076/115] sysctl: faster tree-based sysctl implementation Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 077/115] sysctl: add duplicate entry and sanity ctl_table checks Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 078/115] sysctl: alloc ctl_table_header with kmem_cache Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 079/115] sysctl: single subheader path: optimisation for paths used only once Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 080/115] sysctl: single subheader path: net/ipv4/conf/DEVICE-NAME/ Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 081/115] sysctl: single subheader path: net/{ipv4|ipv6}/neigh/DEV/ Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 082/115] sysctl: single subheader path: net/ipv6/conf/DEVICE-NAME/ Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 083/115] sysctl: single subheader path: dev/parport/PORT/devices/DEVICE/ Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 084/115] sysctl: single subheader path: net/ax25/DEVICE Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 085/115] sysctl: single subheader path: kernel/sched_domain/CPU/DOMAIN/ Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 086/115] sysctl: single subheader path: net/decnet/conf/DEVNAME Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 087/115] sysctl: check netns-specific registration order respected Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 088/115] RFC: sysctl: convert read-write lock to RCU Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 089/115] RFC: sysctl: change type of ctl_procfs_refs to u8 Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 090/115] sysctl: warn if registration/unregistration order is not respected Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 091/115] sysctl: add register_sysctl_dir: register an empty sysctl directory Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 092/115] sysctl: sched: create empty dir with register_sysctl_dir Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 093/115] sysctl: ax25: " Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 094/115] sysctl: net/core: " Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 095/115] sysctl: net/ipv4/neigh: " Lucian Adrian Grijincu
2011-05-08 22:39 ` [v2 096/115] sysctl: net/ipv6/neigh: " Lucian Adrian Grijincu
2011-05-08 22:40 ` [v2 000/115] faster tree-based sysctl implementation David Miller
2011-05-09  3:11 ` Eric W. Biederman
2011-05-10  1:06   ` Lucian Adrian Grijincu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1304894407-32201-67-git-send-email-lucian.grijincu@gmail.com \
    --to=lucian.grijincu@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).