Appletalk: convert some spinlocks to rwlocks

Hi David,

Please pull from:

master.kernel.org:/home/acme/BK/llc-2.5

Now there is only this changeset outstanding.

- Arnaldo

You can import this changeset into BK by piping this whole message to:
'| bk receive [path to repository]' or apply the patch as usual.

===================================================================

[email protected], 2002-10-08 00:05:45-03:00, [email protected]
o Appletalk: convert some spinlocks to rwlocks

- Remove uneeded #ifdef CONFIG_SYSCTL
- Make __init strings __initdata, saving some more bytes after init.

 include/linux/atalk.h            |    4 +-
 net/appletalk/atalk_proc.c       |    8 ++--
 net/appletalk/ddp.c              |   65 +++++++++++++++++++--------------------
 net/appletalk/sysctl_net_atalk.c |    8 ++--
 4 files changed, 42 insertions(+), 43 deletions(-)

diff -Nru a/include/linux/atalk.h b/include/linux/atalk.h
@@ -199,13 +199,13 @@
 #define at_sk(__sk) ((struct atalk_sock *)(__sk)->protinfo)
 
 extern struct sock *atalk_sockets;
-extern spinlock_t atalk_sockets_lock;
+extern rwlock_t atalk_sockets_lock;
 
 extern struct atalk_route *atalk_routes;
 extern rwlock_t atalk_routes_lock;
 
 extern struct atalk_iface *atalk_interfaces;
-extern spinlock_t atalk_interfaces_lock;
+extern rwlock_t atalk_interfaces_lock;
 
 extern struct atalk_route atrtr_default;
 

diff -Nru a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
@@ -30,7 +30,7 @@
 {
 	loff_t l = *pos;
 
-	spin_lock_bh(&atalk_interfaces_lock);
+	read_lock_bh(&atalk_interfaces_lock);
 	return l ? atalk_get_interface_idx(--l) : (void *)1;
 }
 

@@ -53,7 +53,7 @@
 
 static void atalk_seq_interface_stop(struct seq_file *seq, void *v)
 {
-	spin_unlock_bh(&atalk_interfaces_lock);
+	read_unlock_bh(&atalk_interfaces_lock);
 }
 
 static int atalk_seq_interface_show(struct seq_file *seq, void *v)

@@ -154,7 +154,7 @@
 {
 	loff_t l = *pos;
 
-	spin_lock_bh(&atalk_sockets_lock);
+	read_lock_bh(&atalk_sockets_lock);
 	return l ? atalk_get_socket_idx(--l) : (void *)1;
 }
 

@@ -177,7 +177,7 @@
 
 static void atalk_seq_socket_stop(struct seq_file *seq, void *v)
 {
-	spin_unlock_bh(&atalk_sockets_lock);
+	read_unlock_bh(&atalk_sockets_lock);
 }
 
 static int atalk_seq_socket_show(struct seq_file *seq, void *v)

diff -Nru a/net/appletalk/sysctl_net_atalk.c b/net/appletalk/sysctl_net_atalk.c
@@ -7,14 +7,14 @@
  */
 
 #include <linux/config.h>
-#include <linux/sysctl.h>
 
+#ifdef CONFIG_SYSCTL
+#include <linux/sysctl.h>
 extern int sysctl_aarp_expiry_time;
 extern int sysctl_aarp_tick_time;
 extern int sysctl_aarp_retransmit_limit;
 extern int sysctl_aarp_resolve_time;
 
-#ifdef CONFIG_SYSCTL
 static struct ctl_table atalk_table[] = {
 	{
 		.ctl_name	= NET_ATALK_AARP_EXPIRY_TIME,

@@ -83,7 +83,7 @@
 	unregister_sysctl_table(atalk_table_header);
 }
 
-#else
+#else /* CONFIG_PROC_FS */
 void atalk_register_sysctl(void)
 {
 }

@@ -91,4 +91,4 @@
 void atalk_unregister_sysctl(void)
 {
 }
-#endif
+#endif /* CONFIG_PROC_FS */ 

===================================================================

This BitKeeper patch contains the following changesets:
1.633
## Wrapped with gzip_uu ##

begin 664 bkpatch25064 M'XL(`+!+HCT``^U8ZV_B1A#_C/^*T46J[J[%[*[7+U*BRT%RC9)+(I*HJGJ5 MM=CKPPK8R#;D3N*/[SZ<R\NH>VG-*"=8.\\=^8W8^_!3<'S;HN%4V[LP6]9 M479;89;RL$P6SRSJ3G*Q8UAEHD;G7$VY1VYM_/QM#.9A&UBVH:X?<G*<P+ MGA?=%C:M'U?*[S/>;0V//MV<'0X-H]>#_IBE7_D5+Z'7,\HL7[!)5'Q@Y7B2 MI6:9L[28\E(I7O[8NB0($?&QL6LAVUEB!U%W&>((8T8QCQ"AGD,-:=>'Y[8_ MDX(1<I%#7-M=.L@ER!@-AW+D0Z&'60!PAUD=VE=AM9782@5BC\3*&-C(_P M[SK0-T+(X'VFP@)D]LN"+TBIB44(NQ0S))TDH6WA=*^9WZ5S"(;QN&?)HM M.,Q3SB,>P5X21SR&_L7Y\<FGX.J/J_[UF=KWF=UR"((D3830,D_2KT7U,V(E M^P4*MA#7M+YIEG,8?2]Y2PN>0YRFVF<@H,<GQB7#T=IM+?\,PS$D'&P(7PI M+SOL/AB=XGL1EI-7R8O&"&CZ/JBP.U,+7P,L:VST9VZ&(\XIC0^A-L)EQD MBX?$B5&RM!R"G"U-CJ)9C96(VG@9NC3VN,_CV+*LR,*-K'R0]\@PZGN8",.:
M"%"^!;,\"Q_DB'+`R+*7R/.IM71#;Q1[D<]=C]O.J)E==6+OS;,=S]U\U$D:
M3N81[TR2=/Y-RS/'3R)'T9)05]1.&-FQZX^XA1AFR%]AX&J!C\^4^)0J5%KM MCX2I_R:T_U"L(T+K^QKROX(AOAB[Y6^-(9>0'M_$Y]!1Q=KDF'<!M(/H) M-D[4VLHYBP+I;3:O_U)2TY285#,0EZH.^_VC8'M2!:U:I9YNID)VZ[DTJ16 M4R%^\O(1AX<4AR(K%#WCD?516TZ;._CN9;VB.-:6M6[LUE(@JD-47=C;U@6! M-GFM=:'1\%E=U`9\EY(0<9*)IPG_)A2GE;=!"2_S;E]R>)K#6\GQK"3V:[!< M]<S-F;ISXVZ$XD\:]WV:4L_#EDI3O'6>6B)1+>NU9JH>>=8BN(KX+GGJ.D"- M$]<'<I]SBRR)JGS+^=>D$!<#/2^^E;<$0K[<.$]7;!WX6":U6M>D/_1@^'MP M=M$_#6[.)3D:2%Y;\<JU=9<G)=^(]DAITZ1BV03W@LG13$YS/5@U/$T:ZR':
M.$6:-2^J$$&39LUK@!W=(A5IZ(VG^Y6WA#B$8K13KOX3MDW8D3%3'F>41 ME\D.27&?2MF\K&+VNT#2"2,53\';,$_P_N.D*HG"4W6@U]]RA=,DWJW:^9 M*XBMN6QO303J^%P5;$V::],SB29;:+-\I4V3IG,6Q50R:=)\TJ)4U9XFC74Y MRC%-FNNR=10U:34>('VE3)/6%C,DTJY5M"FPN%0S*=JP2$1)B42VC:)D91)" M.&9YE<LCEJ8\__.O1[T>D;K]&AX'IR<'U_`F_.C:]K5K>E:<``R"8(XR^%, M3B8@;YOH2_IFOT8ZSP4,IVQ6+[\_/+F&-S<I&TVXZFP5<L-@<EW23F&J_/# M2U/)_B+1@58C--61GHG"+F_?/E6E<<26T":I)=J)X+!5L)XP:,^K[;[>[DGZ M<I1Y^9)BV[EFUW<HC8:<U>]0'@9S2CTU\=#_'UBW&,S5JZ>UX\[+V.\R^V"= MV%@D:ZU'>]73/RJ'P>T5G-\(%@E5@UTXU3K'I\4'$0CK$1<#B_ZP?&5ZFJ^ EP@ZU[O$T2N+:??#P8CD<<Q'\^;1''!_'S(V-OP$P8FC-N!8````` `
end