X25: use seq_file for proc stuff

BKPATCH Arnaldo Carvalho de Melo 2 participants 3 messages Oct 7, 2002

Subsystems (2)

Networking X.25 stack

lore

Share & tools

lore

Arnaldo Carvalho de Melo

author

2002-10-07 03:26 UTC #0 lore raw

Hi David,

Please consider pulling from:

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

- 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-07 00:18:10-03:00, [email protected]
o X25: use seq_file for proc stuff

Also some CodingStyle cleanups.

 include/net/x25.h   |   11 +-
 net/x25/Makefile    |    2 
 net/x25/af_x25.c    |  146 ++++++++--------------------
 net/x25/x25_proc.c  |  263 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 net/x25/x25_route.c |   65 ------------
 5 files changed, 320 insertions(+), 167 deletions(-)

include/net/x25.h +9 -2

diff -Nru a/include/net/x25.h b/include/net/x25.h
@@ -220,9 +220,8 @@
 /* x25_route.c */
 extern struct x25_route *x25_get_route(struct x25_address *addr);
 extern struct net_device *x25_dev_get(char *);
-extern void x25_route_device_down(struct net_device *);
+extern void x25_route_device_down(struct net_device *dev);
 extern int  x25_route_ioctl(unsigned int, void *);
-extern int  x25_routes_get_info(char *, char **, off_t, int);
 extern void x25_route_free(void);
 
 static __inline__ void x25_route_hold(struct x25_route *rt)

@@ -263,4 +262,12 @@
 	unsigned flags;
 };
 #define X25_SKB_CB(s) ((struct x25_skb_cb *) ((s)->cb))
+
+extern struct sock *x25_list;
+extern rwlock_t x25_list_lock;
+extern struct list_head x25_route_list;
+extern rwlock_t x25_route_list_lock;
+
+extern int x25_proc_init(void);
+extern void x25_proc_exit(void);
 #endif

net/x25/Makefile +1 -1

diff -Nru a/net/x25/Makefile b/net/x25/Makefile
@@ -6,7 +6,7 @@
 
 x25-y			:= af_x25.o x25_dev.o x25_facilities.o x25_in.o \
 			   x25_link.o x25_out.o x25_route.o x25_subr.o \
-			   x25_timer.o
+			   x25_timer.o x25_proc.o
 x25-$(CONFIG_SYSCTL)	+= sysctl_net_x25.o
 x25-objs		:= $(x25-y)

net/x25/af_x25.c +45 ~~-101~~

284 lines not on this page · raw message

net/x25/x25_proc.c new file +263 -0

263 lines not on this page · raw message

net/x25/x25_route.c +2 ~~-63~~

81 lines not on this page · raw message

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

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

begin 664 bkpatch9058 M'XL(`'S_H#T``\T;:7?B1O(S^A45SXL##H<N9+!W9N+XF&''8T]\;+*[V:<G MI!;H(22BP]9LK]]J[H%2"",[4S>&P_0ZJNZ[J[NTKR"^YA%1Q7+'C/I%;P/ MX^2H8H<!LQ-O:C7M<-SL1]AQ$X;8T1J&8]:BL:T?/[0^J^V&VFQ+V/W)2NPA M3%D4'U64IK9L2683=E2Y.7]W?WER(TFO7\/ITH&[)8E\/JUE(31U/*=^<K M&?IAT$PB*XC'+.$+SY=#YZHLJ_BOK1QJ<MN8*X:L'\YMQ5$42U>8(ZMZQ]E MPNN'(8NLYHA%?.;8318!])5NZJB=75C;BB*K$AGH#0-50-9;2ER2SX$63Y2 M.D>*W)"U(UD&#G.='_!]&QJR]"-\6?Q/)1M"^$5M'T$:,XC9;Z;K^0S<,()) M%-H0)ZGKXB#\G/AQ"#%*TY#QPL&M\D,1]H^LX)T$C>E#V"HAB9]6O%;:CSS M3Y)D2Y;>E+-@'K"$%("^)B'7M#F5BBP?RIJ"S)VKAJ&I<\V1#=T^U-5^ASD= MQ7TA.'6N*/HAH?,XS_-PHC!-68HXWZWW9VW9<-0YJZM:F['[MINWU6T=N<) M>.7A98AU9&,N&YVN\F3$+-?$8A,KW3B4E3GK:W:GW>FZG4.EW];5'5@[email protected] MTI7N,WCUT1HQ4K1-E.2./->[?=4YE]=5S4<S>CN0*D+(>2JLE&=R=*7F#[ MJ<-:&;3FL("3WIFW-:/3GK?;CJ6C=JFRHK;5KKT%IW)H>=$IW4Z7NZ5-_2/_ M=,4>@(@Y*NF7_@&Z)'U9X^#N2"XZ(^-(41YW1O)?X8QL^-%+/CV81%G93Z M_E8)7SX)PY]3TGG#6S0_O(GSNJ\@+_]%=P7WDN]]'-_C6;P04HR$OA]JZA M$3WP#])=RMCG<Z\GVT1K0,)#BJ_--4V[MGV"#?F2VN&0H\8;B:X#2&V.(#& MWV]&/!S<OGI_0DD+$YP!W*3!RMB3>"==N@P&%LSZ$?,&L$L3".LVD,O8'6" M@!QQPK$_]?R?&08/(31"!Z\9(@D/2R6C.LP]N(^&UI3!CBCA?O?@6XL?O^ MC,#$=H2CTTD3>@D.'0P38%,6<&A-R&/+$;HY_^F^=W-^"VI3%XLMM]8XG4S" M*,E/&8=.BA9/]7P#$>Y&C"U)/B;RP+8"1-OQXB3R^K@]@)=D*',.-=S9]28 M!@XR-1DR9%PTCB%T>>7=U3V\$[3!I[3O>S9<>C8+8L;G6S%,J#4>,@?Z,S[E M@K"XS;"BQA6XD7!L?D#9<A,(PK',ZF*A#&H=D)E5*Q&R"2<TL888S\"W MDM7<9L:1]TA8&'&FD]IRPSJ)U&BA["J44:/PP!F?R1^2&4,;8E_2J]RCPQ M_,WW@O1S"ZW(]0;-X9N-'B_PDK)VTG+3C<NZ%FL6^\A$XM>;;;RG>-Q\IU MFNGUU<7O7?FIYOK4_/B5HH3Y*8-IND%")^9)H9=46HGLP!X(>!RP15=-S M/E?]T'7-!"9A7)/^*U6R*2BXQ!PRRX$#,90%230[7O;G0$88$,/5_>7E,6)6 MX1,Q[C,96D\U-[<.^\M))HVJ2Y7X;/Y)#ZJ.&-]L3H$:!8U1*/BN5!M-#C6 ME4J%6RTV_T$H1"Q)(U3NY%BB>L:6:>@Y@GYBNU@&NZ*DFJVRU(#?*I#QI># M!6.RNH_H4MNQ6,ER3!]E9?:'U37R>#NAFJ'CPUO8Y'ZCX=?@"*H"NYJR$^6 M?=Z&L1@^W42]3&8<_^^_%Z1P;DXQ;[email protected]*U@^3="5.-),ELGN,8EL2[/ MXI@FH5^G<94-K'+"'83H8;&-2U2`G&981DGC#8WCD.";UQM:5:93^3F/:17S M<=LHDHT#CAY5J76-"B>/BX=+A"M.&NQ0G=Q27I"LKS0,'YZPTE;9;Q,YP9JD M25SEH/9.'"=B<0S+OS-OX"58/V-3=,R_!GN;$OLU)S,.+D+TW0S@MPVEC=._ M;1@._;9C!$$:@:!)3I98KTD(TW.=M\;>P.'KYD8Z;(HFE3VA@"T\4A[!WMNW M;PFE@MQDY"6LF+GI(<G?KIPCU;#8[AW%<.$#Z(Q;C9%:FDW2.Z;1L+\/\3%0 M>XRXH=Z18G*'=9SS4?$C]IYA\>5]U"[OE"/_&>XIF_4G_%.>JSL]4[SFF!:$ M<2=4$,>&/XD7JKD2SIJ^E(AE0RHOMO,G6/ABD6>9^))]>9O'.(F+:-6*@83I M<-N%RRQV,:#(CMH17Q%C*DW1XB;](.!M3<6#&,BNSL"<@^7S;0R.#:0S3 M"/:XY]^;6MB1X$?%CX)?*C6X#9S&3W!C3_'7(Y>\S;DL!(AT98*.1]6XMD3Z M&SKCH5PQONY3L#B?0Y6PX6-S'=QSU(A"TB32G(Q\',G]2+8E%#I*0CGPY<O M<W=R#(M?]'S?:DWM%_1\3N'[K>:GXH?S:&]5%S]M1WQ]9^4N!9E+YB]=YK_E M_ZU[QWLH>5N&5*$",=-ML!HVQ0!B7C35T,)('OX\%8OKBXR)I(PQ?=TWCQ ML)@N:A9O-O$\,O&MF9EX8Q:A3*$%[_^5S4!U$=7</-*?PA"U6-7R,ZPD''NV M2499W4?+?QBSL8E'L]"NU3<ZHURGF!X3%_@Y\RW<7I]^,'M7UV?GU65SK?'& MPYTE1);)E]NWH*4YAQ,\/-$Q)E[;VL,):3B:6I,[?U@H>3%N1:Q$$+39GT59 M3?)2)=W4S+O1OY1U8W-=^N-X)[:9FWH$W?P>5HIO;M<H13CG;DLQSGG*)<K; MW"E2$"S<*?<O<,"+940H_"O]9LY;;:"^*!*'=DIIDC]KE#M"R^\5)+BNCE8 MCPC+74F+8%<J&[RD9N(U60)U\R7QF=I\](9LM&CE%3&47W\L!_-:41X[L!,T M/8+<BI-?'K>%Q/A1?4*7'5I'4F+1H73O(BDLLDP$>7$2ED+^BC9;R8;BPR M(E>+ES*.=SM>)(XT(NQ:M-%HPHWB6B]'"M7XWIT/$]8!32C(PLF1C9@USJ^N M/YY_Y%M9?@7LXH_C$5:J>]BU5Q<M&$[4CE?;[G)&K;!O([@)PK!15BA%/D8< MS?:X7!&87(?"]7,21Z0T+LFC3>B'L5H3#[FVJ4&^2M#>)B>PG80A/1DH, M?P2KG.GM1JO"!2&OGSQMWI"!XNWC<%K.RC64EWPKG[4IRY782+=Y[&>:['-> MLZBVTJRGXU(V=,GM)XS=0)8P?,6/[:V#M?LP<8&WVRZ*IKR;W#]PP<!!/2A= MD5(R&]F;W1GC%Z:/MN01MD#KJETL-!GA:%I;YEF#P_4$LFP\GC7H0D/]RA/( M/#>VEGC88,D+\@YG*L:3BM03!88L#/5F>3H4OD<<K4PG?%AN^6LG+M1:!-3F M@(PV=%#I,E;EQ'B_)KU1@_\&)DL3[;\$'F\-GEU<5N\4RH'LW;G=+S"I;G MK@SF>(/L-0,Y+B0E%SG5W0;PLI2N-+*\'Y*)THS28=1(Z_1#^UA.FXZ;O$ MMJJKFJ;IQEQ5%=7@-J_UP84:"A?N0V(K/66[-N")2^Q@2XI+OU4%J<P<5AK MADMU:(8%)5CD^I^N!,][U6!',K4(C'R@)G<5%-"%:_1J/)S%4!OHP;(7[L. MB)<IMNC@BTOR;^J757F;4&O7&4RZPU14+M'1Z3(W01H8LH>:TX\>IVWF. M#.0=S_3AWRH=7$?"D9@EZ=)9NX/*=F9T<,F>00MO<9/E_A%CJ9N?S4LZKM]? M47%^1OY7)T]M2V#GET@5K]!N/9X4J6;C<:;_!U'A5]\+^^9RB]#:C"?2]G0 M7:""U/?-17/^MKM6@_U]Z4Q3%<2KIZDZM//Y:]OR?>:&X5CTH^(,KP\T2S2 MLV2&,26TTY@2M\C0!/66GF/FNP3(&E@>7?:A=V=1E$X2#B:&?IJ$[(X^"ZA M7#2>"ZP^;@W09R2+;%DGC;!&8$2Z^CJP>=88$1.A6H89X?);RE(&09A;"56X M'R8)#AA:IL'SZ=<>FH/L^0S/"U$8.J:WF1/X-.HP8UB"V745JW<A6BU,6I MR"*JOHL)_65ZF=-/S#/(18EBN4W1'5@4SK(NEJ\,QW5<)HN\VFZ4(E*ZX"+ MZP!^XJ30FE@V3:;)+AD=A%$=NG@^6$HQK;XY?.HCQHRHFLWW(5?@X+Z9F@Z M:="73]UHG<A]Y)'"2$?4%G/AP3\6O4@S5V\T1]!H2;3QY,QK[F^-8B1($/G M,88H<H<Q'K>*-0%]U,1GR5*X8,'YS?GMW<G-W>T_;_F["0F1A>:G<F"\X/9" M%/YN32;,J2&OX&.*:M7W4(:N%^%CZPT":F!P))NH38DXK4)GC8(;/N4;'! MD0%+Z$+Q3W!$-*YX,F$,3Z1G'73PN"@5JK18+?ILDH*;$4.EC5=R&)E]<E*H M'?U"SI#?_<)!T.?VG:[email protected]<I2N+/5+N;I(6X]%A'\>)0W[AT08 ME@)[GU]Z+.A;3+7'J#KAR*.4@#W&=14%W08NS$M5XII(*8Y1'VFSIZ9C)=8@ MLL8HNKK0$MB'_WV\?6>>75_=_7S2N\LRLXN^0A?L1S:%KHJJ<?)XJ?*4+QU8 M[7R,Y/0)']2720,K@IV'<M.P.,R'N_L]!%^[;1U;V%QOG%R?WE'=V8<M"Z M(4!CR4&3HG'(Y%@$;+G^5[BT=LV^8462^36R,;5:L0=]55P+%\$MYVZJSC MC4VE>'=D1K+K7B3DM$3B>%QS/,C,]R[FE@RZ?A;I%G]*S!!@6+CC(Z,#0! MC$+PH<LW7477.J#ANCIWCJLK(7X@X-J<3D8O.S0EJ7HATIA)#\9X$CLZ1@( MZ^/UV?WEN7ER?_?^^J:Z]_<P0.]I!7!ES7QTIG\;Z"/_\P_\%X/X,494=MA, M1V\H$Y3-/3N_/;WI?;KK75]5]^[0+V^^H9!#O<T/J_11AC:H9^#<=D[/;^Z M/:_NO?MTN;=V:%D>C)X3LN8F/>VUW2>\EB`UT7EPF];F[>1Q]V7'=Y5:!C:
M5QZU\I>2'WEM,./*B\[OJ)L:;O5M0/[IMGT],XJHMQV=D93N^S=WIGOST_. MS-Y5[V[MK9;:6O"Y=JK>$H*J:%K=U7]!L(?,'L7I^+5LZ8S^IKT?Y<`)"7B #,```
`
end

Alexander Viro

2002-10-07 03:50 UTC #1 lore raw

Quoted 24 lines · Arnaldo Carvalho de Melo

net/x25/x25_proc.c new file +23 -0

+static struct file_operations x25_seq_socket_fops = {
+	.open		= x25_seq_socket_open,
+	.read		= seq_read,
+	.llseek		= seq_lseek,
+	.release	= seq_release,
+};
+
+static struct file_operations x25_seq_route_fops = {
+	.open		= x25_seq_route_open,
+	.read		= seq_read,
+	.llseek		= seq_lseek,
+	.release	= seq_release,
+};
+
+static int x25_proc_perms(struct inode* inode, int op)
+{
+	return 0;
+}
+
+static struct inode_operations x25_seq_inode = {
+	.permission	= x25_proc_perms,
+};
 
+	p = create_proc_entry("route", 0, x25_proc_dir);

net/x25/x25_proc.c line 235

Quoted 10 lines

net/x25/x25_proc.c new file +10 -0

+	if (!p)
+		goto out_route;
+	p->proc_fops = &x25_seq_route_fops;
+	p->proc_iops = &x25_seq_inode;
+
+	p = create_proc_entry("socket", 0, x25_proc_dir);
+	if (!p)
+		goto out_socket;
+	p->proc_fops = &x25_seq_socket_fops;
+	p->proc_iops = &x25_seq_inode;

Huh???

a) ->permission() always returning 0 on a read-only file is... interesting.
b) if you want it world-readable, kernel is perfectly capable of doing that; had been since the very beginning. Just set mode to 0444 and be done with that; no need to have anything special in ->proc_iops.

Arnaldo Carvalho de Melo

author

2002-10-07 03:57 UTC #2 lore raw

Em Sun, Oct 06, 2002 at 11:56:20PM -0400, Alexander Viro escreveu:

Quoted 6 lines

Huh???
a) ->permission() always returning 0 on a read-only file is... interesting.
b) if you want it world-readable, kernel is perfectly capable of doing that; had been since the very beginning. Just set mode to 0444 and be done with that; no need to have anything special in ->proc_iops.

Just that? Cool, I'll be sending a fix in some minutes.

Thanks Al.

- Arnaldo