DELTA 312396 0 245
SVN Бш!Бш|Б Ы АJ ЭЫ$АP БпJ╕WБ(*curCase)->PoolGUID() != poolGUID
		  && Guid::InvalidGuid() != poolGUID)( vdev->PoolGUID() == m_poolGUID
	   || vdev->PoolGUID() == Guid::InvalidGuid())ENDREP
DELTA 300906 14213 4258
SVN ▀+рb Ь Аa ├-Ы~a		    If InvalidGuid, then only match the vdev GUID
	 * 		    instead of both pool and vdev GUIDsENDREP
DELTA 301080 0 22
SVN Ю>аgВ5 У А@ ВУ*АБs ЙХ*В3nvlist	  **cache_child;
	int	   result;
	uint_t   cache_children	result = nvlist_lookup_nvlist_array(rootVdev,
				      	    ZPOOL_CONFIG_L2CACHE,
				      	    &cache_child,
					    &cache_children);
	if (result == 0)
		for (uint_t c = 0; c < cache_children; c++)
			m_vdevQueue.push_back(cache_child[c]ENDREP
DELTA 300906 70469 1664
SVN ЮЮ+Бc УO АI ВWФ┤ Б ЧАd ЕЩБauint64_t guid);
	Guid(const std::string &guid);
	static Guid InvalidGuid(protected:
	static const uint64_t INVALID_GUID = 0;
uint64_t guid)
  : m_GUID(guid)
{
}

inline Guid
Guid::InvalidGuid()
{
	return (Guid(INVALID_GUID));ENDREP
id: f-300906.0.r325011/1029
type: file
pred: f-300906.0.r312396/270
count: 4
text: 325011 0 190 29820 54ba727c7048a06dd4994cd62445d6d3 e4316655413649f2df153776e8f30cce04e5cdff 325010-6z3o/_5
props: 2 314168 38 0 b6b34f029ed66be42751a530d6e4b830
cpath: /head/cddl/usr.sbin/zfsd/case_file.cc
copyroot: 0 /

id: h-300906.0.r325011/1334
type: file
pred: h-300906.0.r300906/75735
count: 1
text: 325011 216 121 12306 9dd55bd50e26cece8da06ad28d2820f4 b655128e1f521a8ebe41e286c5c14c5a0fbe2e57 325010-6z3o/_6
props: 2 314168 38 0 b6b34f029ed66be42751a530d6e4b830
cpath: /head/cddl/usr.sbin/zfsd/case_file.h
copyroot: 0 /

id: z-300906.0.r325011/1642
type: file
pred: z-300906.0.r301080/53
count: 2
text: 325011 368 341 4199 939688a743047d6bd9cbab60e5b6749b ac42911aa54d7fd25d05e69a527876b226891034 325010-6z3o/_7
props: 2 314168 38 0 b6b34f029ed66be42751a530d6e4b830
cpath: /head/cddl/usr.sbin/zfsd/vdev_iterator.cc
copyroot: 0 /

PLAIN
K 8
Makefile
V 26
file 6-300906.0.r305019/45
K 15
Makefile.common
V 27
file 9-300906.0.r305018/231
K 15
Makefile.depend
V 28
file 4-305148.0.r305148/1926
K 10
callout.cc
V 29
file b-300906.0.r300906/74900
K 9
callout.h
V 26
file d-300906.0.r301003/54
K 12
case_file.cc
V 28
file f-300906.0.r325011/1029
K 11
case_file.h
V 28
file h-300906.0.r325011/1334
K 5
tests
V 27
dir j-300906.0.r320122/4791
K 7
vdev.cc
V 29
file v-300906.0.r300906/77891
K 6
vdev.h
V 27
file x-300906.0.r305013/189
K 16
vdev_iterator.cc
V 28
file z-300906.0.r325011/1642
K 15
vdev_iterator.h
V 30
file 11-300906.0.r300906/78728
K 6
zfsd.8
V 30
file 13-300906.0.r300906/79014
K 7
zfsd.cc
V 27
file 15-300906.0.r320167/58
K 6
zfsd.h
V 30
file 17-300906.0.r300906/79575
K 13
zfsd_event.cc
V 28
file 19-300906.0.r323995/141
K 12
zfsd_event.h
V 30
file 1b-300906.0.r300906/80137
K 17
zfsd_exception.cc
V 30
file 1d-300906.0.r300906/80420
K 16
zfsd_exception.h
V 30
file 1f-300906.0.r300906/80708
K 12
zfsd_main.cc
V 30
file 1h-300906.0.r300906/80995
K 13
zpool_list.cc
V 30
file 1j-300906.0.r300906/81278
K 12
zpool_list.h
V 30
file 1l-300906.0.r300906/81562
END
ENDREP
id: 5-300906.0.r325011/3095
type: dir
pred: 5-300906.0.r323995/1591
count: 17
text: 325011 1951 1131 0 fb99237b9bc55b653b4607fc4b5791a3
cpath: /head/cddl/usr.sbin/zfsd
copyroot: 0 /

PLAIN
K 8
Makefile
V 30
file 6n-168404.0.r321912/30290
K 12
Makefile.inc
V 32
file 6q-168404.0.r168404/1112757
K 6
dtrace
V 28
dir 5-179221.0.r322774/16357
K 8
lockstat
V 28
dir g-192867.0.r314654/21430
K 9
plockstat
V 28
dir 8-211562.0.r314654/22101
K 5
tests
V 29
dir s-264741.0.r299094/116952
K 3
zdb
V 29
dir 6s-168404.0.r314654/22720
K 4
zfsd
V 27
dir 5-300906.0.r325011/3095
K 5
zhack
V 29
dir 1a-236884.0.r314654/23335
END
ENDREP
id: 6m-168404.0.r325011/3715
type: dir
pred: 6m-168404.0.r323995/2210
count: 113
text: 325011 3278 424 0 0fb7f5b08cf31d3e1af0186d44b2b2da
cpath: /head/cddl/usr.sbin
copyroot: 0 /

PLAIN
K 8
Makefile
V 29
file 3-168404.0.r321912/27183
K 12
Makefile.inc
V 27
file 6-168404.0.r270358/521
K 6
compat
V 27
dir 8-168404.0.r323193/1533
K 7
contrib
V 28
dir 1c-168404.0.r324991/3364
K 3
lib
V 29
dir 54-168404.0.r324163/46272
K 4
sbin
V 29
dir 5y-168404.0.r324163/47312
K 5
tests
V 28
dir g-264741.0.r299094/54139
K 7
usr.bin
V 29
dir 6c-168404.0.r321912/30109
K 8
usr.sbin
V 28
dir 6m-168404.0.r325011/3715
END
ENDREP
id: 1-168404.0.r325011/4326
type: dir
pred: 1-168404.0.r324991/3986
count: 967
text: 325011 3895 418 0 cd2a01238c59537d59d645b177c2cdba
props: 321369 13520 795 0 a77dcd03a6a981a8ae82f138c89ab69f
cpath: /head/cddl
copyroot: 0 /
minfo-cnt: 6
minfo-here: y

id: 2m-300906.0.r325011/4581
type: file
pred: 2m-300906.0.r300906/103442
count: 1
text: 325011 734 264 3883 fd6abfe6118d573d69507447dce95b73 dca742480fbe15faed2575901589300f961f4415 325010-6z3o/_a
props: 2 314168 38 0 b6b34f029ed66be42751a530d6e4b830
cpath: /head/lib/libdevdctl/guid.h
copyroot: 0 /

PLAIN
K 8
Makefile
V 31
file 21-300906.0.r300906/100665
K 15
Makefile.depend
V 28
file j-301283.0.r301283/7330
K 11
consumer.cc
V 28
file 24-300906.0.r307364/131
K 10
consumer.h
V 29
file 26-300906.0.r301087/3426
K 8
event.cc
V 27
file 28-300906.0.r300915/52
K 7
event.h
V 27
file 2a-300906.0.r301001/58
K 16
event_factory.cc
V 31
file 2c-300906.0.r300906/102044
K 15
event_factory.h
V 31
file 2e-300906.0.r300906/102328
K 12
exception.cc
V 31
file 2g-300906.0.r300906/102611
K 11
exception.h
V 31
file 2i-300906.0.r300906/102891
K 7
guid.cc
V 31
file 2k-300906.0.r300906/103170
K 6
guid.h
V 29
file 2m-300906.0.r325011/4581
K 5
tests
V 27
dir 2o-300906.0.r312512/482
END
ENDREP
id: 20-300906.0.r325011/5561
type: dir
pred: 20-300906.0.r312512/1348
count: 7
text: 325011 4882 666 0 ee9c5eb680f08bc13d7f5dd9451ad5ae
cpath: /head/lib/libdevdctl
copyroot: 0 /

PLAIN
K 8
Makefile
V 33
file 20-1573.0-1574.r324959/30753
K 12
Makefile.inc
V 26
file 2-1848.0.r201381/3832
K 3
atf
V 28
dir l-241823.0.r322515/20984
K 5
clang
V 27
dir 2-208963.0.r324998/1288
K 3
csu
V 22
dir 7-5.0.r323028/1750
K 8
lib80211
V 27
dir 4-291464.0.r318816/1102
K 8
libalias
V 26
dir 2-26027.0.r312454/2241
K 10
libarchive
V 29
dir 2-125635.0.r324148/116013
K 9
libauditd
V 27
dir 30-186647.0.r312457/475
K 10
libbegemot
V 26
dir 4-135771.0.r312458/468
K 12
libblacklist
V 27
dir h-301226.0.r301283/7150
K 16
libblocksruntime
V 26
dir c-215125.0.r312459/522
K 12
libbluetooth
V 27
dir d-121054.0.r317506/2754
K 10
libbsdstat
V 26
dir 4-262821.0.r299950/574
K 6
libbsm
V 28
dir 4-155212.0.r316006/44595
K 8
libbsnmp
V 27
dir 2-122405.0.r318000/6655
K 6
libbz2
V 25
dir 4-78559.0.r312463/462
K 4
libc
V 26
dir 2-1052.0.r324983/16856
K 6
libc++
V 30
dir l-227983.0.r321369/2614691
K 18
libc++experimental
V 26
dir 4-318594.0.r320884/987
K 14
libc_nonshared
V 26
dir h-258283.0.r312466/665
K 11
libcalendar
V 28
dir 2-31530.0.r298107/174568
K 6
libcam
V 27
dir 2-39209.0.r322515/25292
K 11
libcapsicum
V 26
dir 4-306657.0.r324414/620
K 9
libcasper
V 28
dir 2-258843.0.r322515/29501
K 11
libclang_rt
V 30
dir 2-276857.0.r321369/2620937
K 10
libcom_err
V 24
dir 2-5623.0.r312501/822
K 9
libcompat
V 28
dir 1l-1574.0.r314436/630723
K 14
libcompiler_rt
V 28
dir j-215125.0.r324340/33660
K 8
libcrypt
V 26
dir 2-1985.0.r322515/30581
K 7
libcuse
V 26
dir 7-266581.0.r324320/827
K 8
libcxxrt
V 26
dir p-227983.0.r314104/693
K 9
libdevctl
V 27
dir 7-278320.0.r305034/3458
K 10
libdevdctl
V 28
dir 20-300906.0.r325011/5561
K 10
libdevinfo
V 28
dir 2-75726.0.r298107/188383
K 10
libdevstat
V 28
dir 2-39211.0.r298107/189125
K 5
libdl
V 27
dir b-320872.0.r320884/3964
K 6
libdpv
V 29
dir 4-274116.0.r298107/190394
K 8
libdwarf
V 26
dir 2-179187.0.r312511/469
K 7
libedit
V 26
dir 21-1574.0.r323598/2860
K 9
libefivar
V 27
dir 4-307071.0.r323519/1599
K 6
libelf
V 26
dir 9-164190.0.r312510/468
K 8
libelftc
V 26
dir 9-275373.0.r320663/519
K 8
libevent
V 35
dir 1i-171173.0-273065.r316063/6516
K 11
libexecinfo
V 26
dir 2-254709.0.r312507/470
K 8
libexpat
V 26
dir 2-104352.0.r312508/575
K 8
libfetch
V 25
dir 2-37536.0.r322669/974
K 9
libfigpar
V 30
dir 10-274116.0.r298107/200226
K 9
libgcc_eh
V 26
dir 2-307230.0.r308563/525
K 8
libgcc_s
V 26
dir 9-307230.0.r320673/480
K 7
libgeom
V 27
dir 2-110545.0.r324667/1973
K 7
libgpio
V 26
dir 7-274987.0.r298272/755
K 9
libgssapi
V 28
dir 14-153838.0.r317265/6746
K 16
libiconv_modules
V 28
dir 41-219019.0.r317265/8883
K 11
libifconfig
V 34
dir 4-304815.0-305290.r324656/2517
K 8
libipsec
V 26
dir 4-55505.0.r316759/2964
K 7
libjail
V 27
dir 9-194869.0.r317036/3817
K 9
libkiconv
V 26
dir 9-120492.0.r312500/776
K 6
libkvm
V 26
dir b-1539.0.r322515/33328
K 7
libldns
V 26
dir q-246827.0.r312499/468
K 7
liblzma
V 26
dir d-207842.0.r312498/673
K 8
libmagic
V 28
dir 2-133362.0.r323683/78805
K 5
libmd
V 25
dir 2-1803.0.r320554/2163
K 10
libmemstat
V 27
dir 2-147997.0.r308873/1931
K 9
libmilter
V 28
dir 4-90796.0.r318736/111374
K 5
libmp
V 27
dir 2-80529.0.r322515/34144
K 5
libmt
V 26
dir 8-279219.0.r320991/851
K 9
libnandfs
V 29
dir 9-235537.0.r298107/222469
K 9
libnetbsd
V 27
dir 4-244557.0.r316572/3534
K 11
libnetgraph
V 28
dir 9-52419.0.r298107/224412
K 8
libngatm
V 26
dir 2-121336.0.r312493/493
K 5
libnv
V 27
dir 7-258065.0.r323851/1004
K 10
libopenbsd
V 36
dir 9-228063.0-290351.r298107/228304
K 7
libopie
V 25
dir 7-22373.0.r312491/605
K 6
libpam
V 25
dir 2-1589.0.r325010/2814
K 11
libpathconv
V 28
dir 2-309035.0.r322515/35767
K 7
libpcap
V 25
dir 2-5740.0.r314863/1261
K 5
libpe
V 26
dir 5-295581.0.r312487/473
K 9
libpjdlog
V 29
dir 5-258791.0.r298107/234692
K 6
libpmc
V 28
dir 9-145256.0.r323230/13729
K 10
libpmcstat
V 28
dir 4-324959.0.r324959/33834
K 7
libproc
V 27
dir 2-179185.0.r323227/1852
K 11
libprocstat
V 27
dir 4-221807.0.r324237/3017
K 9
libradius
V 25
dir 2-41119.0.r300602/846
K 13
librpcsec_gss
V 28
dir 1d-181344.0.r317402/2379
K 9
librpcsvc
V 26
dir 2-1983.0.r320122/17852
K 6
librss
V 27
dir 4-306525.0.r320884/5594
K 5
librt
V 28
dir 2-156136.0.r322515/37890
K 10
librtld_db
V 26
dir 2-210678.0.r315727/633
K 7
libsbuf
V 27
dir 7-74840.0.r322515/38626
K 6
libsdp
V 28
dir n-121054.0.r298896/27760
K 5
libsm
V 25
dir 8-90796.0.r312482/465
K 6
libsmb
V 25
dir a-87874.0.r312480/750
K 7
libsmdb
V 25
dir c-64567.0.r312481/466
K 9
libsmutil
V 25
dir g-64567.0.r312479/468
K 10
libsqlite3
V 35
dir 1e-251886.0-274885.r316063/7206
K 9
libstdbuf
V 29
dir 7-234772.0.r298107/257549
K 13
libstdthreads
V 26
dir 9-228904.0.r312477/860
K 12
libsysdecode
V 27
dir a-292236.0.r324984/1753
K 10
libtacplus
V 28
dir 2-41121.0.r298107/260663
K 9
libtelnet
V 25
dir 3q-1574.0.r321806/508
K 6
libthr
V 27
dir 2-112918.0.r324219/4663
K 12
libthread_db
V 26
dir 2-132172.0.r317216/952
K 6
libucl
V 26
dir a-262398.0.r307365/469
K 6
libufs
V 27
dir 5-99193.0.r323923/11165
K 9
libugidfw
V 27
dir 2-101206.0.r324929/1210
K 7
libulog
V 26
dir 8-200062.0.r312471/895
K 10
libunbound
V 26
dir a-255597.0.r312473/510
K 6
libusb
V 34
dir 2-184610.0-189587.r322322/5196
K 9
libusbhid
V 28
dir l-61560.0.r298107/272554
K 7
libutil
V 25
dir n-1553.0.r322665/3935
K 6
libvgl
V 28
dir 2-28328.0.r298107/278403
K 9
libvmmapi
V 34
dir 5-221828.0-245652.r313727/7061
K 7
libwrap
V 25
dir 4-44746.0.r312392/515
K 5
libxo
V 28
dir 7-273567.0.r322515/44205
K 4
liby
V 28
dir 41-1574.0.r314436/668014
K 9
libypclnt
V 25
dir 2-94575.0.r312469/920
K 4
libz
V 25
dir 2-17652.0.r316649/770
K 7
libzstd
V 27
dir 8-316978.0.r317999/2320
K 4
msun
V 27
dir 1f-1573.0.r324340/35504
K 7
ncurses
V 26
dir 7c-3410.0.r322445/1430
K 5
tests
V 29
dir 4-257852.0.r299094/175914
END
ENDREP
id: 6-5.0.r325011/11456
type: dir
pred: 6-5.0.r325010/8701
count: 17827
text: 325011 5740 5703 0 e8eea6d0d116091a9f68586e6041e06c
cpath: /head/lib
copyroot: 0 /
minfo-cnt: 3

PLAIN
K 10
.arcconfig
V 26
file 1-265842.0.r306435/41
K 8
.arclint
V 27
file 1-266959.0.r281789/766
K 9
COPYRIGHT
V 24
file 1-2656.0.r310963/99
K 5
LOCKS
V 27
file 1-146890.0.r255635/270
K 11
MAINTAINERS
V 26
file 1-94742.0.r321369/566
K 8
Makefile
V 31
file 3-1594.0-1595.r324340/5395
K 13
Makefile.inc1
V 26
file 5-38666.0.r325002/102
K 18
Makefile.libcompat
V 34
file 5-38666.0-296709.r324340/5988
K 17
ObsoleteFiles.inc
V 28
file 4-148330.0.r324710/1571
K 6
README
V 26
file 1-21173.0.r318294/114
K 9
README.md
V 27
file 1-314473.0.r314495/558
K 8
UPDATING
V 26
file 1-41806.0.r324846/341
K 3
bin
V 22
dir 1-5.0.r324430/3320
K 4
cddl
V 27
dir 1-168404.0.r325011/4326
K 7
contrib
V 27
dir 1-16755.0.r324938/10728
K 6
crypto
V 27
dir 1-25405.0.r322052/70431
K 3
etc
V 24
dir 1-38.0.r324965/21024
K 3
gnu
V 23
dir 1-3.0.r324340/10730
K 7
include
V 24
dir 1-697.0.r324866/5446
K 9
kerberos5
V 27
dir 4q-29815.0.r322749/1982
K 3
lib
V 23
dir 6-5.0.r325011/11456
K 7
libexec
V 22
dir c-5.0.r324953/4545
K 7
release
V 25
dir 1-3027.0.r324599/6029
K 6
rescue
V 28
dir 7-117035.0.r324351/16171
K 4
sbin
V 23
dir fa-4.0.r324987/5782
K 6
secure
V 26
dir r-1553.0.r321912/89982
K 5
share
V 23
dir e-3.0.r325004/34630
K 3
sys
V 22
dir g-5.0.r325009/5780
K 7
targets
V 34
dir 2-242818.1-284345.r324605/2858
K 5
tests
V 27
dir g-257097.0.r324993/3586
K 5
tools
V 26
dir 43-1590.0.r325000/5979
K 7
usr.bin
V 23
dir m-3.0.r324972/14038
K 8
usr.sbin
V 23
dir q-3.0.r324959/60810
END
ENDREP
id: 5-1.0.r325011/13107
type: dir
pred: 5-1.0.r325010/10350
count: 217035
text: 325011 11631 1463 0 668f7dda34149ac1c5430be5d1f5eece
props: 321369 2803277 2960 0 1d6e39e03a4c357f87f3c149be6de4ac
cpath: /head
copyroot: 0 /
minfo-cnt: 126
minfo-here: y

PLAIN
K 11
ROADMAP.txt
V 26
file 0-179453.0.r285589/70
K 4
head
V 23
dir 5-1.0.r325011/13107
K 8
projects
V 22
dir 6-1.0.r325006/8327
K 7
release
V 22
dir 7-1.0.r324101/3266
K 6
releng
V 23
dir 8-1.0.r324741/32956
K 6
stable
V 23
dir 9-1.0.r325003/70334
K 8
svnadmin
V 27
dir 0-179447.0.r324540/1380
K 4
user
V 23
dir a-1.0.r324919/37151
K 6
vendor
V 22
dir b-1.0.r324819/6274
K 13
vendor-crypto
V 25
dir 0-1575.0.r321988/3899
K 10
vendor-sys
V 27
dir 0-12116.0.r324198/34407
END
ENDREP
id: 0.0.r325011/13846
type: dir
pred: 0.0.r325010/11087
count: 325011
text: 325011 13359 474 0 e676225826733b272c7b9ef67152d221
props: 289270 0 4229 0 20f578acc837c5e58fc64b9eaa493aea
cpath: /
copyroot: 0 /
minfo-cnt: 44296

f-300906.0.t325010-6z3o modify-file true false /head/cddl/usr.sbin/zfsd/case_file.cc

h-300906.0.t325010-6z3o modify-file true false /head/cddl/usr.sbin/zfsd/case_file.h

z-300906.0.t325010-6z3o modify-file true false /head/cddl/usr.sbin/zfsd/vdev_iterator.cc

2m-300906.0.t325010-6z3o modify-file true false /head/lib/libdevdctl/guid.h


13846 14071