Date: Tue, 26 Jul 2011 18:16:55 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 196751 for review Message-ID: <201107261816.p6QIGtXr090827@skunkworks.freebsd.org>
index | next in thread | raw e-mail
http://p4web.freebsd.org/@@196751?ac=10 Change 196751 by peter@peter_daintree on 2011/07/26 18:16:00 IFC @196750 Affected files ... .. //depot/projects/hammer/sbin/mount/mount.c#42 integrate .. //depot/projects/hammer/share/i18n/csmapper/APPLE/ARABIC%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/CELTIC%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/CENTEURO%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/CROATIAN%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/CYRILLIC%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/DEVANAGA%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/DINGBATS%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/FARSI%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/GAELIC%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/GREEK%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/GUJARATI%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/GURMUKHI%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/HEBREW%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/ICELAND%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/INUIT%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/KEYBOARD%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/ROMAN%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/ROMANIAN%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/SYMBOL%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/THAI%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/TURKISH%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25ARABIC.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25CELTIC.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25CENTEURO.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25CROATIAN.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25CYRILLIC.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25DEVANAGA.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25DINGBATS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25FARSI.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25GAELIC.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25GREEK.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25GUJARATI.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25GURMUKHI.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25HEBREW.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25ICELAND.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25INUIT.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25KEYBOARD.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25ROMAN.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25ROMANIAN.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25SYMBOL.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25THAI.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/APPLE/UCS%25TURKISH.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/AST/ARMSCII-7%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/AST/ARMSCII-8%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/AST/ARMSCII-8A%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/AST/UCS%25ARMSCII-7.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/AST/UCS%25ARMSCII-8.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/AST/UCS%25ARMSCII-8A.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/BIG5/Big5UDA%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/BIG5/UCS%25Big5UDA.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CNS/CNS11643-1%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CNS/CNS11643-2%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CNS/UCS%25CNS11643-1.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CNS/UCS%25CNS11643-2.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP037%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP038%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP10000%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP10006%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP10007%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP10029%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1006%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP10079%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP10081%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1026%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1046%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1124%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1125%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1129%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1131%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1133%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1161%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1162%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1163%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1250%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1251%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1252%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1253%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1254%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1255%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1256%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1257%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP1258%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP273%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP274%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP275%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP277%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP278%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP280%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP281%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP284%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP285%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP290%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP297%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP420%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP423%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP424%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP437%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP500%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP737%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP775%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP850%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP851%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP852%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP853%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP855%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP856%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP857%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP858%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP860%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP861%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP862%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP863%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP864%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP865%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP866%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP868%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP869%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP870%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP871%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP874%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP875%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP880%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP891%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP903%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP904%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP905%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP918%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP922%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP932UDA%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP936EXT%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP942EXT%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP949EXT%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/CP950%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP037.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP038.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10000.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10006.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10007.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10029.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1006.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10079.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP10081.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1026.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1046.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1124.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1125.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1129.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1131.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1133.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1161.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1162.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1163.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1250.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1251.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1252.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1253.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1254.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1255.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1256.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1257.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP1258.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP273.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP274.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP275.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP277.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP278.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP280.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP281.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP284.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP285.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP290.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP297.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP420.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP423.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP424.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP437.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP500.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP737.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP775.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP850.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP851.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP852.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP853.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP855.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP856.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP857.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP858.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP860.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP861.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP862.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP863.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP864.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP865.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP866.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP868.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP869.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP870.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP871.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP874.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP875.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP880.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP891.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP903.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP904.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP905.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP918.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP922.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP932UDA.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP936EXT.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP942EXT.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP949EXT.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/CP/UCS%25CP950.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-AT-DE%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-AT-DE-A%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-CA-FR%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-DK-NO%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-DK-NO-A%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-ES%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-ES-A%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-ES-S%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-FI-SE%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-FI-SE-A%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-FR%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-IT%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-PT%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/EBCDIC-UK%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-AT-DE-A.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-AT-DE.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-CA-FR.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-DK-NO-A.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-DK-NO.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES-A.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES-S.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-ES.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FI-SE-A.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FI-SE.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-FR.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-IT.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-PT.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/EBCDIC/UCS%25EBCDIC-UK.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/GB12345%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/GB2312%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/GB2312EXT%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/GB2312GBK%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/GB2312UDA1%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/GB2312UDA2%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/GBKEXT%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/GBKUDA%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/ISO-IR-165EXT%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GB12345.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GB2312.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GB2312EXT.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GB2312UDA1.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GB2312UDA2.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GBKEXT.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25GBKUDA.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/GB/UCS%25ISO-IR-165EXT.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/GEORGIAN/GEORGIAN-ACADEMY%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/GEORGIAN/GEORGIAN-PS%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/GEORGIAN/UCS%25GEORGIAN-ACADEMY.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/GEORGIAN/UCS%25GEORGIAN-PS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-10%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-11%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-13%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-14%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-15%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-16%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-2%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-3%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-4%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-5%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-6%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-7%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-8%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/ISO-8859-9%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-10.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-11.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-13.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-14.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-15.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-16.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-2.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-3.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-4.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-5.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-6.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-7.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-8.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO-8859/UCS%25ISO-8859-9.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-CA%25UCS.646#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-CA2%25UCS.646#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-CN%25UCS.646#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-CU%25UCS.646#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-DE%25UCS.646#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-DK%25UCS.646#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-ES%25UCS.646#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-ES2%25UCS.646#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-FI%25UCS.646#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-FR%25UCS.646#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-FR1%25UCS.646#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-GB%25UCS.646#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-HU%25UCS.646#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-IT%25UCS.646#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-JP%25UCS.646#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-JP-OCR-B%25UCS.646#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-KR%25UCS.646#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-NO%25UCS.646#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-NO2%25UCS.646#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-PT%25UCS.646#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-PT2%25UCS.646#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-SE%25UCS.646#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-SE2%25UCS.646#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-US%25UCS.646#5 branch .. //depot/projects/hammer/share/i18n/csmapper/ISO646/ISO646-YU%25UCS.646#5 branch .. //depot/projects/hammer/share/i18n/csmapper/JIS/JISX0201-KANA%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/JIS/JISX0208UDC%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/JIS/JISX0212%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/JIS/JISX0212UDC%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/JIS/UCS%25JISX0201-KANA.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/JIS/UCS%25JISX0208UDC.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/JIS/UCS%25JISX0212.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/JIS/UCS%25JISX0212UDC.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KAZAKH/KZ1048%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KAZAKH/PTCP154%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KAZAKH/UCS%25KZ1048.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KAZAKH/UCS%25PTCP154.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/GOST19768-74%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/ISO-5427%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI7%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-C%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-CyrillicOld%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-E%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-R%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-RU%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-T%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/KOI8-U%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25GOST19768-74.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25ISO-5427.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI7.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-C.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-CyrillicOld.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-E.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-R.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-RU.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-T.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8-U.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KOI/UCS%25KOI8.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KS/JOHAB%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KS/KSC5601HANGUL%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KS/KSC5601HANJA%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KS/UCS%25JOHAB.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KS/UCS%25KSC5601HANGUL.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/KS/UCS%25KSC5601HANJA.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/MISC/ATARIST%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/MISC/DECMCS%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/MISC/HP-ROMAN8%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/MISC/MULELAO-1%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/MISC/NEXTSTEP%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/MISC/RISCOS-LATIN1%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/MISC/TDS565%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25ATARIST.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25DECMCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25HP-ROMAN8.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25MULELAO-1.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25NEXTSTEP.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25RISCOS-LATIN1.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/MISC/UCS%25TDS565.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/TCVN/TCVN5712-1%25UCS.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/TCVN/UCS%25TCVN5712-1.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/TCVN/UCS%25VISCII.src#5 branch .. //depot/projects/hammer/share/i18n/csmapper/TCVN/VISCII%25UCS.src#5 branch .. //depot/projects/hammer/sys/boot/forth/loader.conf#58 integrate .. //depot/projects/hammer/sys/conf/NOTES#178 integrate .. //depot/projects/hammer/sys/conf/newvers.sh#32 integrate .. //depot/projects/hammer/sys/conf/options#156 integrate .. //depot/projects/hammer/sys/fs/cd9660/iso.h#3 integrate .. //depot/projects/hammer/sys/fs/msdosfs/msdosfsmount.h#16 integrate .. //depot/projects/hammer/sys/fs/ntfs/ntfs.h#10 integrate .. //depot/projects/hammer/sys/fs/smbfs/smbfs.h#10 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#58 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#68 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#114 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#154 integrate .. //depot/projects/hammer/sys/netgraph/ng_ether.c#41 integrate .. //depot/projects/hammer/sys/netgraph/ng_mppc.c#15 integrate .. //depot/projects/hammer/sys/netgraph/ng_parse.c#14 integrate .. //depot/projects/hammer/sys/powerpc/aim/locore32.S#4 integrate .. //depot/projects/hammer/sys/sys/mount.h#71 integrate .. //depot/projects/hammer/sys/sys/systm.h#73 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#71 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#97 integrate .. //depot/projects/hammer/sys/ufs/ufs/inode.h#21 integrate Differences ... ==== //depot/projects/hammer/sbin/mount/mount.c#42 (text+ko) ==== @@ -37,7 +37,7 @@ #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/mount/mount.c,v 1.113 2011/06/07 18:48:49 delphij Exp $"); +__FBSDID("$FreeBSD: src/sbin/mount/mount.c,v 1.114 2011/07/24 18:27:09 mckusick Exp $"); #include <sys/param.h> #include <sys/mount.h> @@ -109,6 +109,7 @@ { MNT_NOCLUSTERW, "noclusterw" }, { MNT_SUIDDIR, "suiddir" }, { MNT_SOFTDEP, "soft-updates" }, + { MNT_SUJ, "journaled soft-updates" }, { MNT_MULTILABEL, "multilabel" }, { MNT_ACLS, "acls" }, { MNT_NFS4ACLS, "nfsv4acls" }, @@ -316,7 +317,7 @@ rval = 0; switch (argc) { case 0: - if ((mntsize = getmntinfo(&mntbuf, MNT_NOWAIT)) == 0) + if ((mntsize = getmntinfo(&mntbuf, MNT_WAIT)) == 0) err(1, "getmntinfo"); if (all) { while ((fs = getfsent()) != NULL) { @@ -665,7 +666,7 @@ struct statfs *mntbuf; int i, mntsize; - mntsize = getmntinfo(&mntbuf, MNT_NOWAIT); + mntsize = getmntinfo(&mntbuf, MNT_WAIT); for (i = mntsize - 1; i >= 0; i--) { if (strcmp(mntbuf[i].f_mntfromname, name) == 0 || strcmp(mntbuf[i].f_mntonname, name) == 0) ==== //depot/projects/hammer/sys/boot/forth/loader.conf#58 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.157 2011/04/13 12:19:03 pluknet Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.158 2011/07/25 21:52:17 rodrigc Exp $ ############################################################## ### Basic configuration options ############################ @@ -55,6 +55,11 @@ #prompt="\\${interpret}" # Set the command prompt #root_disk_unit="0" # Force the root disk unit number #rootdev="disk1s1a" # Set the root filesystem +#tftp.blksize="1428" # Set the RFC 2348 TFTP block size. + # If the TFTP server does not support RFC 2348, + # the block size is set to 512. If the value + # is out of range ( < 8 || > 9008 ) an error is + # returned. ############################################################## ==== //depot/projects/hammer/sys/conf/NOTES#178 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1617 2011/07/19 00:37:24 attilio Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1618 2011/07/25 09:12:48 avg Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -499,16 +499,6 @@ options REGRESSION # -# RESTARTABLE_PANICS allows one to continue from a panic as if it were -# a call to the debugger to continue from a panic as instead. It is only -# useful if a kernel debugger is present. To restart from a panic, reset -# the panicstr variable to NULL and continue execution. This option is -# for development use only and should NOT be used in production systems -# to "workaround" a panic. -# -#options RESTARTABLE_PANICS - -# # This option lets some drivers co-exist that can't co-exist in a running # system. This is used to be able to compile all kernel code in one go for # quality assurance purposes (like this file, which the option takes it name ==== //depot/projects/hammer/sys/conf/newvers.sh#32 (text+ko) ==== @@ -28,11 +28,11 @@ # SUCH DAMAGE. # # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 -# $FreeBSD: src/sys/conf/newvers.sh,v 1.93 2011/05/23 19:57:12 ru Exp $ +# $FreeBSD: src/sys/conf/newvers.sh,v 1.94 2011/07/26 04:00:00 kensmith Exp $ TYPE="FreeBSD" REVISION="9.0" -BRANCH="CURRENT" +BRANCH="BETA1" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi ==== //depot/projects/hammer/sys/conf/options#156 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.737 2011/07/19 00:37:24 attilio Exp $ +# $FreeBSD: src/sys/conf/options,v 1.738 2011/07/25 09:12:48 avg Exp $ # # On the handling of kernel options # @@ -579,7 +579,6 @@ LOCK_PROFILING_FAST opt_global.h MSIZE opt_global.h REGRESSION opt_global.h -RESTARTABLE_PANICS opt_global.h RWLOCK_NOINLINE opt_global.h SX_NOINLINE opt_global.h VFS_BIO_DEBUG opt_global.h ==== //depot/projects/hammer/sys/fs/cd9660/iso.h#3 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)iso.h 8.6 (Berkeley) 5/10/95 - * $FreeBSD: src/sys/fs/cd9660/iso.h,v 1.33 2007/02/15 22:08:34 pjd Exp $ + * $FreeBSD: src/sys/fs/cd9660/iso.h,v 1.34 2011/07/24 17:43:09 mckusick Exp $ */ #define ISODCL(from, to) (to - from + 1) @@ -220,7 +220,7 @@ #endif struct iso_mnt { - int im_flags; + uint64_t im_flags; struct mount *im_mountp; struct cdev *im_dev; ==== //depot/projects/hammer/sys/fs/msdosfs/msdosfsmount.h#16 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/fs/msdosfs/msdosfsmount.h,v 1.42 2010/10/10 07:05:47 kib Exp $ */ +/* $FreeBSD: src/sys/fs/msdosfs/msdosfsmount.h,v 1.43 2011/07/24 17:43:09 mckusick Exp $ */ /* $NetBSD: msdosfsmount.h,v 1.17 1997/11/17 15:37:07 ws Exp $ */ /*- @@ -103,7 +103,7 @@ u_int pm_fatdiv; /* offset computation */ u_int pm_curfat; /* current fat for FAT32 (0 otherwise) */ u_int *pm_inusemap; /* ptr to bitmap of in-use clusters */ - u_int pm_flags; /* see below */ + uint64_t pm_flags; /* see below */ void *pm_u2w; /* Local->Unicode iconv handle */ void *pm_w2u; /* Unicode->Local iconv handle */ void *pm_u2d; /* Unicode->DOS iconv handle */ ==== //depot/projects/hammer/sys/fs/ntfs/ntfs.h#10 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/ntfs/ntfs.h,v 1.22 2009/12/07 15:15:08 guido Exp $ + * $FreeBSD: src/sys/fs/ntfs/ntfs.h,v 1.23 2011/07/24 17:43:09 mckusick Exp $ */ /*#define NTFS_DEBUG 1*/ @@ -250,7 +250,7 @@ uid_t ntm_uid; gid_t ntm_gid; mode_t ntm_mode; - u_int ntm_flag; + uint64_t ntm_flag; cn_t ntm_cfree; struct ntvattrdef *ntm_ad; int ntm_adnum; ==== //depot/projects/hammer/sys/fs/smbfs/smbfs.h#10 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/smbfs/smbfs.h,v 1.14 2010/04/07 16:50:38 joel Exp $ + * $FreeBSD: src/sys/fs/smbfs/smbfs.h,v 1.15 2011/07/24 17:43:09 mckusick Exp $ */ #ifndef _SMBFS_SMBFS_H_ #define _SMBFS_SMBFS_H_ @@ -80,7 +80,7 @@ struct mount * sm_mp; struct smbnode * sm_root; struct ucred * sm_owner; - u_int sm_flags; + uint64_t sm_flags; long sm_nextino; struct smb_share * sm_share; /* struct simplelock sm_npslock;*/ ==== //depot/projects/hammer/sys/kern/kern_jail.c#58 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.146 2011/07/03 12:22:02 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_jail.c,v 1.147 2011/07/24 17:43:09 mckusick Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -540,8 +540,8 @@ #ifdef INET6 int ip6s, redo_ip6; #endif - unsigned pr_flags, ch_flags; - unsigned pr_allow, ch_allow, tallow; + uint64_t pr_allow, ch_allow, pr_flags, ch_flags; + unsigned tallow; char numbuf[12]; error = priv_check(td, PRIV_JAIL_SET); ==== //depot/projects/hammer/sys/kern/kern_shutdown.c#68 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/kern_shutdown.c,v 1.211 2011/06/08 19:28:59 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_shutdown.c,v 1.212 2011/07/25 09:12:48 avg Exp $"); #include "opt_ddb.h" #include "opt_kdb.h" @@ -594,15 +594,6 @@ kdb_backtrace(); if (debugger_on_panic) kdb_enter(KDB_WHY_PANIC, "panic"); -#ifdef RESTARTABLE_PANICS - /* See if the user aborted the panic, in which case we continue. */ - if (panicstr == NULL) { -#ifdef SMP - atomic_store_rel_int(&panic_cpu, NOCPU); -#endif - return; - } -#endif #endif /*thread_lock(td); */ td->td_flags |= TDF_INPANIC; ==== //depot/projects/hammer/sys/kern/vfs_mount.c#114 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.334 2011/07/11 05:17:46 ae Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.335 2011/07/24 17:43:09 mckusick Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -1496,7 +1496,8 @@ } int -vfs_flagopt(struct vfsoptlist *opts, const char *name, u_int *w, u_int val) +vfs_flagopt(struct vfsoptlist *opts, const char *name, uint64_t *w, + uint64_t val) { struct vfsopt *opt; ==== //depot/projects/hammer/sys/kern/vfs_subr.c#154 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.812 2011/06/29 16:40:41 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.813 2011/07/24 18:27:09 mckusick Exp $"); #include "opt_ddb.h" #include "opt_watchdog.h" @@ -2841,6 +2841,7 @@ MNT_FLAG(MNT_ASYNC); MNT_FLAG(MNT_SUIDDIR); MNT_FLAG(MNT_SOFTDEP); + MNT_FLAG(MNT_SUJ); MNT_FLAG(MNT_NOSYMFOLLOW); MNT_FLAG(MNT_GJOURNAL); MNT_FLAG(MNT_MULTILABEL); @@ -2866,7 +2867,6 @@ MNT_FLAG(MNT_FORCE); MNT_FLAG(MNT_SNAPSHOT); MNT_FLAG(MNT_BYFSID); - MNT_FLAG(MNT_SOFTDEP); #undef MNT_FLAG if (flags != 0) { if (buf[0] != '\0') @@ -2894,7 +2894,6 @@ MNT_KERN_FLAG(MNTK_REFEXPIRE); MNT_KERN_FLAG(MNTK_EXTENDED_SHARED); MNT_KERN_FLAG(MNTK_SHARED_WRITES); - MNT_KERN_FLAG(MNTK_SUJ); MNT_KERN_FLAG(MNTK_UNMOUNT); MNT_KERN_FLAG(MNTK_MWAIT); MNT_KERN_FLAG(MNTK_SUSPEND); ==== //depot/projects/hammer/sys/netgraph/ng_ether.c#41 (text+ko) ==== @@ -39,7 +39,7 @@ * Authors: Archie Cobbs <archie@freebsd.org> * Julian Elischer <julian@freebsd.org> * - * $FreeBSD: src/sys/netgraph/ng_ether.c,v 1.80 2011/07/16 19:11:45 zec Exp $ + * $FreeBSD: src/sys/netgraph/ng_ether.c,v 1.81 2011/07/25 09:12:48 avg Exp $ */ /* @@ -604,9 +604,6 @@ NG_FREE_ITEM(item); panic("%s: weird hook", __func__); -#ifdef RESTARTABLE_PANICS /* so we don't get an error msg in LINT */ - return (0); -#endif } /* ==== //depot/projects/hammer/sys/netgraph/ng_mppc.c#15 (text+ko) ==== @@ -38,7 +38,7 @@ * Author: Archie Cobbs <archie@freebsd.org> * * $Whistle: ng_mppc.c,v 1.4 1999/11/25 00:10:12 archie Exp $ - * $FreeBSD: src/sys/netgraph/ng_mppc.c,v 1.39 2011/04/18 09:12:27 glebius Exp $ + * $FreeBSD: src/sys/netgraph/ng_mppc.c,v 1.40 2011/07/25 09:12:48 avg Exp $ */ /* @@ -404,9 +404,6 @@ /* Oops */ panic("%s: unknown hook", __func__); -#ifdef RESTARTABLE_PANICS - return (EINVAL); -#endif } /* ==== //depot/projects/hammer/sys/netgraph/ng_parse.c#14 (text+ko) ==== @@ -38,7 +38,7 @@ * Author: Archie Cobbs <archie@freebsd.org> * * $Whistle: ng_parse.c,v 1.3 1999/11/29 01:43:48 archie Exp $ - * $FreeBSD: src/sys/netgraph/ng_parse.c,v 1.31 2008/10/23 15:53:51 des Exp $ + * $FreeBSD: src/sys/netgraph/ng_parse.c,v 1.32 2011/07/25 09:12:48 avg Exp $ */ #include <sys/types.h> @@ -374,9 +374,6 @@ break; default: panic("%s: unknown type", __func__); -#ifdef RESTARTABLE_PANICS - return(0); -#endif } if ((error = ng_parse_append(&cbuf, &cbuflen, fmt, fval)) != 0) return (error); @@ -473,9 +470,6 @@ break; default: panic("%s: unknown type", __func__); -#ifdef RESTARTABLE_PANICS - return(0); -#endif } if ((error = ng_parse_append(&cbuf, &cbuflen, fmt, fval)) != 0) return (error); @@ -575,9 +569,6 @@ break; default: panic("%s: unknown type", __func__); -#ifdef RESTARTABLE_PANICS - return(0); -#endif } if ((error = ng_parse_append(&cbuf, &cbuflen, fmt, fval)) != 0) return (error); @@ -673,9 +664,6 @@ break; default: panic("%s: unknown type", __func__); -#ifdef RESTARTABLE_PANICS - return(0); -#endif } if ((error = ng_parse_append(&cbuf, &cbuflen, fmt, fval)) != 0) return (error); ==== //depot/projects/hammer/sys/powerpc/aim/locore32.S#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/powerpc/aim/locore32.S,v 1.4 2011/07/18 15:19:40 attilio Exp $ */ +/* $FreeBSD: src/sys/powerpc/aim/locore32.S,v 1.5 2011/07/25 20:10:01 andreast Exp $ */ /* $NetBSD: locore.S,v 1.24 2000/05/31 05:09:17 thorpej Exp $ */ /*- @@ -91,13 +91,13 @@ GLOBAL(intrnames) .space INTRCNT_COUNT * (MAXCOMLEN + 1) * 2 GLOBAL(sintrnames) - .word INTRCNT_COUNT * (MAXCOMLEN + 1) * 2 + .long INTRCNT_COUNT * (MAXCOMLEN + 1) * 2 .align 4 GLOBAL(intrcnt) .space INTRCNT_COUNT * 4 * 2 GLOBAL(sintrcnt) - .word INTRCNT_COUNT * 4 * 2 + .long INTRCNT_COUNT * 4 * 2 .text .globl btext ==== //depot/projects/hammer/sys/sys/mount.h#71 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)mount.h 8.21 (Berkeley) 5/20/95 - * $FreeBSD: src/sys/sys/mount.h,v 1.257 2011/05/22 01:07:54 rmacklem Exp $ + * $FreeBSD: src/sys/sys/mount.h,v 1.259 2011/07/24 18:27:09 mckusick Exp $ */ #ifndef _SYS_MOUNT_H_ @@ -166,8 +166,7 @@ int mnt_nvnodelistsize; /* (i) # of vnodes */ int mnt_writeopcount; /* (i) write syscalls pending */ int mnt_kern_flag; /* (i) kernel only flags */ - u_int mnt_flag; /* (i) flags shared with user */ - u_int mnt_xflag; /* (i) more flags shared with user */ + uint64_t mnt_flag; /* (i) flags shared with user */ u_int mnt_noasync; /* (i) # noasync overrides */ struct vfsoptlist *mnt_opt; /* current mount options */ struct vfsoptlist *mnt_optnew; /* new options passed to fs */ @@ -224,43 +223,44 @@ /* * User specifiable flags, stored in mnt_flag. */ -#define MNT_RDONLY 0x00000001 /* read only filesystem */ -#define MNT_SYNCHRONOUS 0x00000002 /* filesystem written synchronously */ -#define MNT_NOEXEC 0x00000004 /* can't exec from filesystem */ -#define MNT_NOSUID 0x00000008 /* don't honor setuid bits on fs */ -#define MNT_UNION 0x00000020 /* union with underlying filesystem */ -#define MNT_ASYNC 0x00000040 /* filesystem written asynchronously */ -#define MNT_SUIDDIR 0x00100000 /* special handling of SUID on dirs */ -#define MNT_SOFTDEP 0x00200000 /* soft updates being done */ -#define MNT_NOSYMFOLLOW 0x00400000 /* do not follow symlinks */ -#define MNT_GJOURNAL 0x02000000 /* GEOM journal support enabled */ -#define MNT_MULTILABEL 0x04000000 /* MAC support for individual objects */ -#define MNT_ACLS 0x08000000 /* ACL support enabled */ -#define MNT_NOATIME 0x10000000 /* disable update of file access time */ -#define MNT_NOCLUSTERR 0x40000000 /* disable cluster read */ -#define MNT_NOCLUSTERW 0x80000000 /* disable cluster write */ -#define MNT_NFS4ACLS 0x00000010 +#define MNT_RDONLY 0x0000000000000001ULL /* read only filesystem */ +#define MNT_SYNCHRONOUS 0x0000000000000002ULL /* fs written synchronously */ +#define MNT_NOEXEC 0x0000000000000004ULL /* can't exec from filesystem */ +#define MNT_NOSUID 0x0000000000000008ULL /* don't honor setuid fs bits */ +#define MNT_NFS4ACLS 0x0000000000000010ULL /* enable NFS version 4 ACLs */ +#define MNT_UNION 0x0000000000000020ULL /* union with underlying fs */ +#define MNT_ASYNC 0x0000000000000040ULL /* fs written asynchronously */ +#define MNT_SUIDDIR 0x0000000000100000ULL /* special SUID dir handling */ +#define MNT_SOFTDEP 0x0000000000200000ULL /* using soft updates */ +#define MNT_NOSYMFOLLOW 0x0000000000400000ULL /* do not follow symlinks */ +#define MNT_GJOURNAL 0x0000000002000000ULL /* GEOM journal support enabled */ +#define MNT_MULTILABEL 0x0000000004000000ULL /* MAC support for objects */ +#define MNT_ACLS 0x0000000008000000ULL /* ACL support enabled */ +#define MNT_NOATIME 0x0000000010000000ULL /* dont update file access time */ +#define MNT_NOCLUSTERR 0x0000000040000000ULL /* disable cluster read */ +#define MNT_NOCLUSTERW 0x0000000080000000ULL /* disable cluster write */ +#define MNT_SUJ 0x0000000100000000ULL /* using journaled soft updates */ /* * NFS export related mount flags. */ -#define MNT_EXRDONLY 0x00000080 /* exported read only */ -#define MNT_EXPORTED 0x00000100 /* filesystem is exported */ -#define MNT_DEFEXPORTED 0x00000200 /* exported to the world */ -#define MNT_EXPORTANON 0x00000400 /* use anon uid mapping for everyone */ -#define MNT_EXKERB 0x00000800 /* exported with Kerberos uid mapping */ -#define MNT_EXPUBLIC 0x20000000 /* public export (WebNFS) */ +#define MNT_EXRDONLY 0x0000000000000080ULL /* exported read only */ +#define MNT_EXPORTED 0x0000000000000100ULL /* filesystem is exported */ +#define MNT_DEFEXPORTED 0x0000000000000200ULL /* exported to the world */ +#define MNT_EXPORTANON 0x0000000000000400ULL /* anon uid mapping for all */ +#define MNT_EXKERB 0x0000000000000800ULL /* exported with Kerberos */ +#define MNT_EXPUBLIC 0x0000000020000000ULL /* public export (WebNFS) */ /* * Flags set by internal operations, * but visible to the user. * XXX some of these are not quite right.. (I've never seen the root flag set) */ -#define MNT_LOCAL 0x00001000 /* filesystem is stored locally */ -#define MNT_QUOTA 0x00002000 /* quotas are enabled on filesystem */ -#define MNT_ROOTFS 0x00004000 /* identifies the root filesystem */ -#define MNT_USER 0x00008000 /* mounted by a user */ -#define MNT_IGNORE 0x00800000 /* do not show entry in df */ +#define MNT_LOCAL 0x0000000000001000ULL /* filesystem is stored locally */ +#define MNT_QUOTA 0x0000000000002000ULL /* quotas are enabled on fs */ +#define MNT_ROOTFS 0x0000000000004000ULL /* identifies the root fs */ +#define MNT_USER 0x0000000000008000ULL /* mounted by a user */ +#define MNT_IGNORE 0x0000000000800000ULL /* do not show entry in df */ /* * Mask of flags that are visible to statfs(). @@ -268,7 +268,7 @@ * but the 'mount' program may need changing to handle this. */ #define MNT_VISFLAGMASK (MNT_RDONLY | MNT_SYNCHRONOUS | MNT_NOEXEC | \ - MNT_NOSUID | MNT_UNION | \ + MNT_NOSUID | MNT_UNION | MNT_SUJ | \ MNT_ASYNC | MNT_EXRDONLY | MNT_EXPORTED | \ MNT_DEFEXPORTED | MNT_EXPORTANON| MNT_EXKERB | \ MNT_LOCAL | MNT_USER | MNT_QUOTA | \ @@ -293,12 +293,12 @@ * XXX: MNT_BYFSID collides with MNT_ACLS, but because MNT_ACLS is only used for * mount(2) and MNT_BYFSID is only used for unmount(2) it's harmless. */ -#define MNT_UPDATE 0x00010000 /* not a real mount, just an update */ -#define MNT_DELEXPORT 0x00020000 /* delete export host lists */ -#define MNT_RELOAD 0x00040000 /* reload filesystem data */ -#define MNT_FORCE 0x00080000 /* force unmount or readonly change */ -#define MNT_SNAPSHOT 0x01000000 /* snapshot the filesystem */ -#define MNT_BYFSID 0x08000000 /* specify filesystem by ID. */ +#define MNT_UPDATE 0x0000000000010000ULL /* not real mount, just update */ +#define MNT_DELEXPORT 0x0000000000020000ULL /* delete export host lists */ +#define MNT_RELOAD 0x0000000000040000ULL /* reload filesystem data */ +#define MNT_FORCE 0x0000000000080000ULL /* force unmount or readonly */ +#define MNT_SNAPSHOT 0x0000000001000000ULL /* snapshot the filesystem */ +#define MNT_BYFSID 0x0000000008000000ULL /* specify filesystem by ID. */ #define MNT_CMDFLAGS (MNT_UPDATE | MNT_DELEXPORT | MNT_RELOAD | \ MNT_FORCE | MNT_SNAPSHOT | MNT_BYFSID) /* @@ -325,7 +325,6 @@ #define MNTK_REFEXPIRE 0x00000020 /* refcount expiring is happening */ #define MNTK_EXTENDED_SHARED 0x00000040 /* Allow shared locking for more ops */ #define MNTK_SHARED_WRITES 0x00000080 /* Allow shared locking for writes */ -#define MNTK_SUJ 0x00000100 /* Softdep journaling enabled */ #define MNTK_UNMOUNT 0x01000000 /* unmount in progress */ #define MNTK_MWAIT 0x02000000 /* waiting for unmount to finish */ #define MNTK_SUSPEND 0x08000000 /* request write suspension */ @@ -715,7 +714,8 @@ void vfs_freeopts(struct vfsoptlist *opts); void vfs_deleteopt(struct vfsoptlist *opts, const char *name); int vfs_buildopts(struct uio *auio, struct vfsoptlist **options); -int vfs_flagopt(struct vfsoptlist *opts, const char *name, u_int *w, u_int val); +int vfs_flagopt(struct vfsoptlist *opts, const char *name, uint64_t *w, + uint64_t val); int vfs_getopt(struct vfsoptlist *, const char *, void **, int *); int vfs_getopt_pos(struct vfsoptlist *opts, const char *name); char *vfs_getopts(struct vfsoptlist *, const char *, int *error); ==== //depot/projects/hammer/sys/sys/systm.h#73 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)systm.h 8.7 (Berkeley) 3/29/95 - * $FreeBSD: src/sys/sys/systm.h,v 1.299 2011/07/09 15:21:10 kib Exp $ + * $FreeBSD: src/sys/sys/systm.h,v 1.300 2011/07/25 09:12:48 avg Exp $ */ #ifndef _SYS_SYSTM_H_ @@ -160,11 +160,7 @@ void *phashinit(int count, struct malloc_type *type, u_long *nentries); void g_waitidle(void); -#ifdef RESTARTABLE_PANICS -void panic(const char *, ...) __printflike(1, 2); -#else void panic(const char *, ...) __dead2 __printflike(1, 2); -#endif void cpu_boot(int); void cpu_flush_dcache(void *, size_t); >>> TRUNCATED FOR MAIL (1000 lines) <<<home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107261816.p6QIGtXr090827>