Browse Source

Plan 9 from Bell Labs 2004-06-11

David du Colombier 16 years ago
parent
commit
985c393a99
5 changed files with 74 additions and 31 deletions
  1. 24 4
      dist/replica/_plan9.db
  2. 23 23
      dist/replica/plan9.db
  3. 23 0
      dist/replica/plan9.log
  4. 1 1
      sys/src/9/pc/ethermii.h
  5. 3 3
      sys/src/lib9p/file.c

+ 24 - 4
dist/replica/_plan9.db

@@ -27,7 +27,7 @@
 386/bin/9660srv - 775 sys sys 1085076971 101995
 386/bin/aan - 775 sys sys 1085076971 128820
 386/bin/acid - 775 sys sys 1085076972 371882
-386/bin/acme - 775 sys sys 1085076973 424873
+386/bin/acme - 775 sys sys 1086836655 424880
 386/bin/ape - 20000000775 sys sys 1016944144 0
 386/bin/ape/basename - 775 sys sys 1071245280 133877
 386/bin/ape/cc - 775 sys sys 1085076973 68304
@@ -5352,7 +5352,7 @@ sys/src/9/pc/etherga620fw.h - 644 sys sys 1026847642 222295
 sys/src/9/pc/etherif.h - 664 sys sys 1045063564 961
 sys/src/9/pc/etherigbe.c - 664 sys sys 1081706478 42962
 sys/src/9/pc/ethermii.c - 664 sys sys 1084331434 4612
-sys/src/9/pc/ethermii.h - 664 sys sys 1039895684 3259
+sys/src/9/pc/ethermii.h - 664 sys sys 1086873891 3258
 sys/src/9/pc/etherrhine.c - 664 sys sys 1081706478 13799
 sys/src/9/pc/ethersink.c - 664 sys sys 1048644103 1076
 sys/src/9/pc/ethersmc.c - 664 sys sys 1071245461 15103
@@ -11319,7 +11319,7 @@ sys/src/lib9p - 20000000775 sys sys 1015023311 0
 sys/src/lib9p/_post.c - 664 sys sys 1044836326 1641
 sys/src/lib9p/dirread.c - 664 sys sys 1015023310 641
 sys/src/lib9p/fid.c - 664 sys sys 1015023310 1051
-sys/src/lib9p/file.c - 664 sys sys 1015023310 5585
+sys/src/lib9p/file.c - 664 sys sys 1086896814 5585
 sys/src/lib9p/ftest.c - 664 sys sys 1015023310 502
 sys/src/lib9p/intmap.c - 664 sys sys 1016833881 2255
 sys/src/lib9p/mem.c - 664 sys sys 1015023310 765
@@ -12427,4 +12427,24 @@ usr/glenda/lib/profile - 664 glenda glenda 1021580005 847
 usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
 usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
 usr/glenda/tmp - 20000000775 glenda glenda 1018802620 0
-386/bin/acme - 775 sys sys 1086836655 424880
+386/bin/archfs - 775 sys sys 1086923024 138783
+386/bin/cdfs - 775 sys sys 1086923027 158995
+386/bin/nntpfs - 775 sys sys 1086923029 159031
+386/bin/snapfs - 775 sys sys 1086923030 354625
+386/bin/webcookies - 775 sys sys 1086923031 159352
+386/bin/wikifs - 775 sys sys 1086923032 199190
+386/bin/rdbfs - 775 sys sys 1086923029 166495
+386/bin/webfs - 775 sys sys 1086923032 347848
+386/bin/auth/factotum - 775 sys sys 1086923025 307127
+386/bin/aux/apm - 775 sys sys 1086923025 172135
+386/bin/aux/disksim - 775 sys sys 1086923026 142348
+386/bin/aux/flashfs - 775 sys sys 1086923026 158321
+386/bin/aux/olefs - 775 sys sys 1086923026 141297
+386/bin/aux/stub - 775 sys sys 1086923027 132993
+386/bin/execnet - 775 sys sys 1086923028 169987
+386/bin/ext2srv - 775 sys sys 1086923028 172062
+386/bin/mntgen - 775 sys sys 1086923028 133463
+386/bin/nfs - 775 sys sys 1086923029 313626
+386/bin/sshnet - 775 sys sys 1086923031 281102
+386/lib/lib9p.a - 664 sys sys 1086923033 79306
+acme/bin/386/win - 775 sys sys 1086923033 177119

+ 23 - 23
dist/replica/plan9.db

@@ -46,7 +46,7 @@
 386/bin/ape/uname - 775 sys sys 1071245288 133706
 386/bin/aquarela - 775 sys sys 1064598027 319170
 386/bin/ar - 775 sys sys 1085076974 109700
-386/bin/archfs - 775 sys sys 1085076974 138783
+386/bin/archfs - 775 sys sys 1086923024 138783
 386/bin/ascii - 775 sys sys 1085076975 62654
 386/bin/astro - 775 sys sys 1085076975 138775
 386/bin/auth - 20000000775 sys sys 1016920815 0
@@ -60,7 +60,7 @@
 386/bin/auth/debug - 775 sys sys 1085076979 98973
 386/bin/auth/disable - 775 sys sys 1020319057 146
 386/bin/auth/enable - 775 sys sys 1020319057 134
-386/bin/auth/factotum - 775 sys sys 1085076979 308454
+386/bin/auth/factotum - 775 sys sys 1086923025 307127
 386/bin/auth/fgui - 775 sys sys 1085076980 212283
 386/bin/auth/guard.srv - 775 sys sys 1085076980 140340
 386/bin/auth/iam - 775 sys sys 1085076981 50791
@@ -92,7 +92,7 @@
 386/bin/aux/accupoint - 775 sys sys 1085076988 40013
 386/bin/aux/acidleak - 775 sys sys 1064598060 67816
 386/bin/aux/antiword - 775 sys sys 1070288096 511478
-386/bin/aux/apm - 775 sys sys 1085076989 172135
+386/bin/aux/apm - 775 sys sys 1086923025 172135
 386/bin/aux/astarld - 775 sys sys 1085076989 62660
 386/bin/aux/cddb - 775 sys sys 1085076989 69917
 386/bin/aux/clog - 775 sys sys 1085076989 64403
@@ -101,11 +101,11 @@
 386/bin/aux/cropmarks - 775 sys sys 1020319062 1808
 386/bin/aux/data2s - 775 sys sys 1085076990 58501
 386/bin/aux/depend - 775 sys sys 1085076991 143665
-386/bin/aux/disksim - 775 sys sys 1085076991 142348
+386/bin/aux/disksim - 775 sys sys 1086923026 142348
 386/bin/aux/download - 775 sys sys 1071245289 177517
 386/bin/aux/faxreceive - 775 sys sys 1085076991 81973
 386/bin/aux/faxsend - 775 sys sys 1085076992 87471
-386/bin/aux/flashfs - 775 sys sys 1085076993 158321
+386/bin/aux/flashfs - 775 sys sys 1086923026 158321
 386/bin/aux/g3p9bit - 775 sys sys 1085076993 65307
 386/bin/aux/getflags - 775 sys sys 1085076993 43818
 386/bin/aux/grabit - 775 sys sys 1020319063 1244
@@ -127,7 +127,7 @@
 386/bin/aux/na - 775 sys sys 1085076998 152641
 386/bin/aux/nfsmount - 775 sys sys 1085076999 232240
 386/bin/aux/nfsserver - 775 sys sys 1085076999 183065
-386/bin/aux/olefs - 775 sys sys 1085077000 141297
+386/bin/aux/olefs - 775 sys sys 1086923026 141297
 386/bin/aux/p9bitpost - 775 sys sys 1085077001 127286
 386/bin/aux/pcmcia - 775 sys sys 1085077001 46277
 386/bin/aux/pcnfsd - 775 sys sys 1085077002 126987
@@ -144,7 +144,7 @@
 386/bin/aux/sprog - 775 sys sys 1085077006 77357
 386/bin/aux/ssh_genkey - 775 sys sys 1045537957 194629
 386/bin/aux/sshserve - 775 sys sys 1085077007 251118
-386/bin/aux/stub - 775 sys sys 1085077008 132993
+386/bin/aux/stub - 775 sys sys 1086923027 132993
 386/bin/aux/tcpostio - 775 sys sys 1071245296 199664
 386/bin/aux/text2post - 775 sys sys 1085077008 76406
 386/bin/aux/timesync - 775 sys sys 1085077008 126318
@@ -176,7 +176,7 @@
 386/bin/calendar - 775 sys sys 1085077018 77283
 386/bin/cat - 775 sys sys 1085077018 37419
 386/bin/cb - 775 sys sys 1085077018 75486
-386/bin/cdfs - 775 sys sys 1085077019 158995
+386/bin/cdfs - 775 sys sys 1086923027 158995
 386/bin/cfs - 775 sys sys 1085077019 126008
 386/bin/chgrp - 775 sys sys 1085077019 57253
 386/bin/chmod - 775 sys sys 1085077020 60320
@@ -222,9 +222,9 @@
 386/bin/echo - 775 sys sys 1085077038 55323
 386/bin/ed - 775 sys sys 1085077038 91066
 386/bin/eqn - 775 sys sys 1071245302 244127
-386/bin/execnet - 775 sys sys 1085077039 169987
+386/bin/execnet - 775 sys sys 1086923028 169987
 386/bin/exportfs - 775 sys sys 1085077040 159178
-386/bin/ext2srv - 775 sys sys 1085077041 172062
+386/bin/ext2srv - 775 sys sys 1086923028 172062
 386/bin/faces - 775 sys sys 1085077041 190555
 386/bin/factor - 775 sys sys 1085077042 59443
 386/bin/file - 775 sys sys 1085077042 114644
@@ -313,7 +313,7 @@
 386/bin/mkdir - 775 sys sys 1085077078 58975
 386/bin/mkpaqfs - 775 sys sys 1085077078 92648
 386/bin/mkstate - 775 sys sys 1085077078 61487
-386/bin/mntgen - 775 sys sys 1085077079 133463
+386/bin/mntgen - 775 sys sys 1086923028 133463
 386/bin/mount - 775 sys sys 1085077079 71022
 386/bin/ms2html - 775 sys sys 1085077079 101558
 386/bin/mtime - 775 sys sys 1085077080 57150
@@ -333,9 +333,9 @@
 386/bin/netkey - 775 sys sys 1085077084 70215
 386/bin/netstat - 775 sys sys 1085077084 81935
 386/bin/news - 775 sys sys 1085077084 69654
-386/bin/nfs - 775 sys sys 1085077085 313626
+386/bin/nfs - 775 sys sys 1086923029 313626
 386/bin/nm - 775 sys sys 1085077085 119507
-386/bin/nntpfs - 775 sys sys 1085077086 159031
+386/bin/nntpfs - 775 sys sys 1086923029 159031
 386/bin/ns - 775 sys sys 1085077086 63226
 386/bin/p - 775 sys sys 1085077086 62948
 386/bin/page - 775 sys sys 1085077086 229583
@@ -359,7 +359,7 @@
 386/bin/qc - 775 sys sys 1063639757 291344
 386/bin/ramfs - 775 sys sys 1085077091 86527
 386/bin/rc - 775 sys sys 1085077091 140758
-386/bin/rdbfs - 775 sys sys 1085077092 166495
+386/bin/rdbfs - 775 sys sys 1086923029 166495
 386/bin/read - 775 sys sys 1085077092 56014
 386/bin/replica - 20000000775 sys sys 1018321168 0
 386/bin/replica/applychanges - 775 sys sys 1085077092 96631
@@ -386,7 +386,7 @@
 386/bin/size - 775 sys sys 1085077097 74163
 386/bin/sleep - 775 sys sys 1085077097 3413
 386/bin/snap - 775 sys sys 1085077097 285793
-386/bin/snapfs - 775 sys sys 1085077098 354625
+386/bin/snapfs - 775 sys sys 1086923030 354625
 386/bin/sniffer - 775 sys sys 1038443185 99028
 386/bin/snoopy - 775 sys sys 1085077098 152766
 386/bin/sort - 775 sys sys 1085077099 80213
@@ -396,7 +396,7 @@
 386/bin/srvfs - 775 sys sys 1085077099 39578
 386/bin/srvold9p - 775 sys sys 1085077100 128139
 386/bin/ssh - 775 sys sys 1085077100 210573
-386/bin/sshnet - 775 sys sys 1085077101 282425
+386/bin/sshnet - 775 sys sys 1086923031 281102
 386/bin/stats - 775 sys sys 1085077101 188503
 386/bin/strings - 775 sys sys 1085077101 60090
 386/bin/strip - 775 sys sys 1085077101 59994
@@ -490,10 +490,10 @@
 386/bin/vt - 775 sys sys 1085077128 170967
 386/bin/vtdump - 775 sys sys 1085077129 157507
 386/bin/wc - 775 sys sys 1085077129 41133
-386/bin/webcookies - 775 sys sys 1085077129 159352
-386/bin/webfs - 775 sys sys 1085077130 349173
+386/bin/webcookies - 775 sys sys 1086923031 159352
+386/bin/webfs - 775 sys sys 1086923032 347848
 386/bin/webfsget - 775 sys sys 1085077130 39115
-386/bin/wikifs - 775 sys sys 1085077131 199190
+386/bin/wikifs - 775 sys sys 1086923032 199190
 386/bin/winwatch - 775 sys sys 1085077131 141299
 386/bin/xd - 775 sys sys 1085077131 61998
 386/bin/xmr - 775 sys sys 1085077131 40129
@@ -523,7 +523,7 @@
 386/lib/ape/libregexp.a - 664 sys sys 1085077139 47502
 386/lib/ape/libutf.a - 664 sys sys 1073851264 81308
 386/lib/ape/libv.a - 664 sys sys 1073851264 19648
-386/lib/lib9p.a - 664 sys sys 1085077139 79302
+386/lib/lib9p.a - 664 sys sys 1086923033 79306
 386/lib/libString.a - 664 sys sys 1073851264 22204
 386/lib/libauth.a - 664 sys sys 1076990357 56134
 386/lib/libauthsrv.a - 664 sys sys 1085077139 33658
@@ -621,7 +621,7 @@ acme/bin/386/acd - 775 sys sys 1032232412 137068
 acme/bin/386/adict - 775 sys sys 1015011247 99806
 acme/bin/386/mkwnew - 775 sys sys 1085077134 38931
 acme/bin/386/spout - 775 sys sys 1085077134 59585
-acme/bin/386/win - 775 sys sys 1085077134 177119
+acme/bin/386/win - 775 sys sys 1086923033 177119
 acme/bin/Battery - 775 sys sys 1017457907 451
 acme/bin/Isspam - 775 sys sys 1063951165 235
 acme/bin/Perl - 775 sys sys 1015011260 230
@@ -5352,7 +5352,7 @@ sys/src/9/pc/etherga620fw.h - 644 sys sys 1026847642 222295
 sys/src/9/pc/etherif.h - 664 sys sys 1045063564 961
 sys/src/9/pc/etherigbe.c - 664 sys sys 1081706478 42962
 sys/src/9/pc/ethermii.c - 664 sys sys 1084331434 4612
-sys/src/9/pc/ethermii.h - 664 sys sys 1039895684 3259
+sys/src/9/pc/ethermii.h - 664 sys sys 1086873891 3258
 sys/src/9/pc/etherrhine.c - 664 sys sys 1081706478 13799
 sys/src/9/pc/ethersink.c - 664 sys sys 1048644103 1076
 sys/src/9/pc/ethersmc.c - 664 sys sys 1071245461 15103
@@ -11319,7 +11319,7 @@ sys/src/lib9p - 20000000775 sys sys 1015023311 0
 sys/src/lib9p/_post.c - 664 sys sys 1044836326 1641
 sys/src/lib9p/dirread.c - 664 sys sys 1015023310 641
 sys/src/lib9p/fid.c - 664 sys sys 1015023310 1051
-sys/src/lib9p/file.c - 664 sys sys 1015023310 5585
+sys/src/lib9p/file.c - 664 sys sys 1086896814 5585
 sys/src/lib9p/ftest.c - 664 sys sys 1015023310 502
 sys/src/lib9p/intmap.c - 664 sys sys 1016833881 2255
 sys/src/lib9p/mem.c - 664 sys sys 1015023310 765

+ 23 - 0
dist/replica/plan9.log

@@ -15580,3 +15580,26 @@
 1086579068 0 c 386/bin/8c - 775 sys sys 1086577386 340969
 1086811311 0 c sys/src/cmd/acme/exec.c - 664 sys sys 1086809679 28158
 1086838316 0 c 386/bin/acme - 775 sys sys 1086836655 424880
+1086874323 0 c sys/src/9/pc/ethermii.h - 664 sys sys 1086873891 3258
+1086897607 0 c sys/src/lib9p/file.c - 664 sys sys 1086896814 5585
+1086924613 0 c 386/bin/archfs - 775 sys sys 1086923024 138783
+1086924613 1 c 386/bin/cdfs - 775 sys sys 1086923027 158995
+1086924613 2 c 386/bin/nntpfs - 775 sys sys 1086923029 159031
+1086924613 3 c 386/bin/snapfs - 775 sys sys 1086923030 354625
+1086924613 4 c 386/bin/webcookies - 775 sys sys 1086923031 159352
+1086924613 5 c 386/bin/wikifs - 775 sys sys 1086923032 199190
+1086924613 6 c 386/bin/rdbfs - 775 sys sys 1086923029 166495
+1086924613 7 c 386/bin/webfs - 775 sys sys 1086923032 347848
+1086924613 8 c 386/bin/auth/factotum - 775 sys sys 1086923025 307127
+1086924613 9 c 386/bin/aux/apm - 775 sys sys 1086923025 172135
+1086924613 10 c 386/bin/aux/disksim - 775 sys sys 1086923026 142348
+1086924613 11 c 386/bin/aux/flashfs - 775 sys sys 1086923026 158321
+1086924613 12 c 386/bin/aux/olefs - 775 sys sys 1086923026 141297
+1086924613 13 c 386/bin/aux/stub - 775 sys sys 1086923027 132993
+1086924613 14 c 386/bin/execnet - 775 sys sys 1086923028 169987
+1086924613 15 c 386/bin/ext2srv - 775 sys sys 1086923028 172062
+1086924613 16 c 386/bin/mntgen - 775 sys sys 1086923028 133463
+1086924613 17 c 386/bin/nfs - 775 sys sys 1086923029 313626
+1086924613 18 c 386/bin/sshnet - 775 sys sys 1086923031 281102
+1086924613 19 c 386/lib/lib9p.a - 664 sys sys 1086923033 79306
+1086924613 20 c acme/bin/386/win - 775 sys sys 1086923033 177119

+ 1 - 1
sys/src/9/pc/ethermii.h

@@ -43,7 +43,7 @@ enum {					/* Bmsr */
 	BmsrEs		= 0x0100,	/* Extended Status */
 	Bmsr100T2HD	= 0x0200,	/* 100BASE-T2 HD Capable */
 	Bmsr100T2FD	= 0x0400,	/* 100BASE-T2 FD Capable */
-	Bmsr10THD	= 0x0800,	/* 100BASE-T HD Capable */
+	Bmsr10THD	= 0x0800,	/* 10BASE-T HD Capable */
 	Bmsr10TFD	= 0x1000,	/* 10BASE-T FD Capable */
 	Bmsr100TXHD	= 0x2000,	/* 100BASE-TX HD Capable */
 	Bmsr100TXFD	= 0x4000,	/* 100BASE-TX FD Capable */

+ 3 - 3
sys/src/lib9p/file.c

@@ -100,20 +100,20 @@ removefile(File *f)
 		return -1;
 	}
 
-	wlock(fp);
 	wlock(f);
+	wlock(fp);
 	if(f->nchild != 0){
 		werrstr("has children");
-		wunlock(f);
 		wunlock(fp);
+		wunlock(f);
 		closefile(f);
 		return -1;
 	}
 
 	if(f->parent != fp){
 		werrstr("parent changed underfoot");
-		wunlock(f);
 		wunlock(fp);
+		wunlock(f);
 		closefile(f);
 		return -1;
 	}