PERFORCE change 109179 for review
John Birrell
jb at FreeBSD.org
Sat Nov 4 00:46:43 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=109179
Change 109179 by jb at jb_freebsd8 on 2006/11/04 00:45:54
IFC
Affected files ...
.. //depot/projects/dtrace/ports/GIDs#7 integrate
.. //depot/projects/dtrace/ports/UIDs#8 integrate
.. //depot/projects/dtrace/src/lib/libc/sparc64/sys/Makefile.inc#4 integrate
.. //depot/projects/dtrace/src/lib/libc/sparc64/sys/__sparc_utrap_gen.S#4 integrate
.. //depot/projects/dtrace/src/sbin/mdmfs/mdmfs.8#6 integrate
.. //depot/projects/dtrace/src/sbin/mdmfs/mdmfs.c#4 integrate
.. //depot/projects/dtrace/src/share/man/man4/aac.4#4 integrate
Differences ...
==== //depot/projects/dtrace/ports/GIDs#7 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: ports/GIDs,v 1.13 2006/11/01 20:22:48 marcus Exp $
+$FreeBSD: ports/GIDs,v 1.14 2006/11/04 00:30:02 rafan Exp $
# Please keep this file sorted by GID!
bind:*:53:
rdfdb:*:55:
@@ -59,6 +59,7 @@
moinmoin:*:192:
sympa:*:200:
dspam:*:202:
+bs:*:220:
_tor:*:256:
_dns-proxy-tor:*:257:
_trans-proxy-tor:*:258:
==== //depot/projects/dtrace/ports/UIDs#8 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: ports/UIDs,v 1.15 2006/11/01 20:06:03 alepulver Exp $
+$FreeBSD: ports/UIDs,v 1.16 2006/11/04 00:30:02 rafan Exp $
# Please keep this file sorted by UID!
bind:*:53:53:Bind Sandbox:/:/sbin/nologin
majordom:*:54:54:Majordomo Pseudo User:/usr/local/majordomo:/nonexistent
@@ -71,6 +71,7 @@
privoxy:*:201:201:Privoxy proxy user:/nonexistent:/sbin/nologin
dspam:*:202:202:Dspam:/nonexistent:/sbin/nologin
shoutcast:*:210:210:Shoutcast sandbox:/nonexistent:/bin/sh
+bs:*:220:220:Big Sister:/usr/local/bigsister:/bin/sh
_tor:*:256:256:Tor anonymising router:/var/db/tor:/bin/sh
_dns-proxy-tor:*:257:257:dns-proxy-tor user:/nonexistent:/sbin/nologin
_trans-proxy-tor:*:258:258:dns-proxy-tor user:/nonexistent:/sbin/nologin
==== //depot/projects/dtrace/src/lib/libc/sparc64/sys/Makefile.inc#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc/sparc64/sys/Makefile.inc,v 1.9 2003/08/11 07:14:07 bms Exp $
+# $FreeBSD: src/lib/libc/sparc64/sys/Makefile.inc,v 1.10 2006/11/03 23:43:18 kmacy Exp $
SRCS+= __sparc_sigtramp_setup.c \
__sparc_utrap.c \
@@ -11,6 +11,9 @@
sigcode.S
CFLAGS+= -I${.CURDIR}/sparc64/fpu
+.if ${MACHINE} == "sun4v"
+CFLAGS+= -DSUN4V
+.endif
MDASM+= brk.S cerror.S exect.S pipe.S ptrace.S sbrk.S setlogin.S sigaction.S
==== //depot/projects/dtrace/src/lib/libc/sparc64/sys/__sparc_utrap_gen.S#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap_gen.S,v 1.4 2002/06/30 05:36:49 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap_gen.S,v 1.5 2006/11/03 23:43:18 kmacy Exp $");
.register %g2, #ignore
.register %g3, #ignore
@@ -38,6 +38,10 @@
#include "assym.s"
ENTRY(__sparc_utrap_gen)
+#ifdef SUN4V
+ save
+ ta %xcc, ST_FPEMU_CONTEXT
+#endif
sub %sp, UF_SIZEOF, %sp
stx %o0, [%sp + SPOFF + CCFSZ + UF_TYPE]
==== //depot/projects/dtrace/src/sbin/mdmfs/mdmfs.8#6 (text+ko) ====
@@ -23,9 +23,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/mdmfs/mdmfs.8,v 1.25 2006/10/21 16:02:42 ru Exp $
+.\" $FreeBSD: src/sbin/mdmfs/mdmfs.8,v 1.26 2006/11/03 12:02:24 ru Exp $
.\"
-.Dd October 1, 2006
+.Dd November 3, 2006
.Dt MDMFS 8
.Os
.Sh NAME
@@ -56,26 +56,6 @@
.Op Fl w Ar user : Ns Ar group
.Ar md-device
.Ar mount-point
-.Nm
-.Fl C
-.Op Fl lNU
-.Op Fl a Ar maxcontig
-.Op Fl b Ar block-size
-.Op Fl c Ar cylinders
-.Op Fl d Ar rotdelay
-.Op Fl E Ar path-mdconfig
-.Op Fl e Ar maxbpg
-.Op Fl F Ar file
-.Op Fl f Ar frag-size
-.Op Fl i Ar bytes
-.Op Fl m Ar percent-free
-.Op Fl n Ar rotational-positions
-.Op Fl O Ar optimization
-.Op Fl o Ar mount-options
-.Op Fl s Ar size
-.Op Fl v Ar version
-.Ar md-device
-.Ar mount-point
.Sh DESCRIPTION
The
.Nm
@@ -134,12 +114,6 @@
option).
.It Fl b Ar block-size
The block size of the file system, in bytes.
-.It Fl C
-Enable full compatibility mode with
-.Xr mount_mfs 8 .
-See the
-.Sx COMPATIBILITY
-section for more information.
.It Fl c Ar cylinders
The number of cylinders per cylinder group in the file system.
.It Fl D
@@ -250,7 +224,7 @@
.Pq Dv MD_MALLOC .
.It Fl U
Enable soft-updates on the file system.
-This is the default, even in compatibility mode, and is accepted only
+This is the default, and is accepted only
for compatibility.
It is only really useful to negate the
.Fl S
@@ -337,19 +311,16 @@
.Sh COMPATIBILITY
The
.Nm
-utility, while designed to be fully compatible with
+utility, while designed to be compatible with
.Xr mount_mfs 8 ,
can be useful by itself.
Since
.Xr mount_mfs 8
had some silly defaults, a
-.Dq full compatibility
+.Dq compatibility
mode is provided for the case where bug-to-bug compatibility is desired.
.Pp
-Full compatibility is enabled with the
-.Fl C
-flag,
-or by starting
+Compatibility is enabled by starting
.Nm
with the name
.Li mount_mfs
@@ -357,17 +328,14 @@
.Li mfs
(as returned by
.Xr getprogname 3 ) .
-In this mode, only the options which would be accepted by
-.Xr mount_mfs 8
-are valid.
-Furthermore, the following behavior, as done by
+In this mode, the following behavior, as done by
.Xr mount_mfs 8 ,
is duplicated:
.Bl -bullet -offset indent
.It
The file mode of
.Ar mount-point
-is set to
+is set by default to
.Li 01777
as if
.Fl p Ar 1777
==== //depot/projects/dtrace/src/sbin/mdmfs/mdmfs.c#4 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/mdmfs/mdmfs.c,v 1.27 2006/02/16 21:28:54 sobomax Exp $");
+__FBSDID("$FreeBSD: src/sbin/mdmfs/mdmfs.c,v 1.28 2006/11/03 12:02:24 ru Exp $");
#include <sys/param.h>
#include <sys/mdioctl.h>
@@ -61,7 +61,6 @@
bool mi_have_mode;
};
-static bool compat; /* Full compatibility with mount_mfs? */
static bool debug; /* Emit debugging information? */
static bool loudsubs; /* Suppress output from helper programs? */
static bool norun; /* Actually run the helper programs? */
@@ -119,8 +118,11 @@
/* If we were started as mount_mfs or mfs, imply -C. */
if (strcmp(getprogname(), "mount_mfs") == 0 ||
- strcmp(getprogname(), "mfs") == 0)
- compat = true;
+ strcmp(getprogname(), "mfs") == 0) {
+ /* Make compatibility assumptions. */
+ mi.mi_mode = 01777;
+ mi.mi_have_mode = true;
+ }
while ((ch = getopt(argc, argv,
"a:b:Cc:Dd:E:e:F:f:hi:LlMm:Nn:O:o:Pp:Ss:t:Uv:w:X")) != -1)
@@ -132,16 +134,12 @@
argappend(&newfs_arg, "-b %s", optarg);
break;
case 'C':
- if (compat)
- usage();
- compat = true;
+ /* Ignored for compatibility. */
break;
case 'c':
argappend(&newfs_arg, "-c %s", optarg);
break;
case 'D':
- if (compat)
- usage();
detach = false;
break;
case 'd':
@@ -170,8 +168,6 @@
argappend(&newfs_arg, "-i %s", optarg);
break;
case 'L':
- if (compat)
- usage();
loudsubs = true;
break;
case 'l':
@@ -187,8 +183,6 @@
argappend(&newfs_arg, "-m %s", optarg);
break;
case 'N':
- if (compat)
- usage();
norun = true;
break;
case 'n':
@@ -201,13 +195,9 @@
argappend(&mount_arg, "-o %s", optarg);
break;
case 'P':
- if (compat)
- usage();
newfs = false;
break;
case 'p':
- if (compat)
- usage();
if ((set = setmode(optarg)) == NULL)
usage();
mi.mi_mode = getmode(set, S_IRWXU | S_IRWXG | S_IRWXO);
@@ -215,8 +205,6 @@
free(set);
break;
case 'S':
- if (compat)
- usage();
softdep = false;
break;
case 's':
@@ -229,13 +217,9 @@
argappend(&newfs_arg, "-O %s", optarg);
break;
case 'w':
- if (compat)
- usage();
extract_ugid(optarg, &mi);
break;
case 'X':
- if (compat)
- usage();
debug = true;
break;
default:
@@ -246,12 +230,6 @@
if (argc < 2)
usage();
- /* Make compatibility assumptions. */
- if (compat) {
- mi.mi_mode = 01777;
- mi.mi_have_mode = true;
- }
-
/* Derive 'unit' (global). */
unitstr = argv[0];
if (strncmp(unitstr, "/dev/", 5) == 0)
@@ -671,23 +649,12 @@
static void
usage(void)
{
- const char *name;
- if (compat)
- name = getprogname();
- else
- name = "mdmfs";
- if (!compat)
- fprintf(stderr,
+ fprintf(stderr,
"usage: %s [-DLlMNPSUX] [-a maxcontig] [-b block-size] [-c cylinders]\n"
"\t[-d rotdelay] [-E path-mdconfig] [-e maxbpg] [-F file] [-f frag-size]\n"
"\t[-i bytes] [-m percent-free] [-n rotational-positions] [-O optimization]\n"
"\t[-o mount-options] [-p permissions] [-s size] [-v version]\n"
-"\t[-w user:group] md-device mount-point\n", name);
- fprintf(stderr,
-"usage: %s -C [-lNU] [-a maxcontig] [-b block-size] [-c cylinders]\n"
-"\t[-d rotdelay] [-E path-mdconfig] [-e maxbpg] [-F file] [-f frag-size]\n"
-"\t[-i bytes] [-m percent-free] [-n rotational-positions] [-O optimization]\n"
-"\t[-o mount-options] [-s size] [-v version] md-device mount-point\n", name);
+"\t[-w user:group] md-device mount-point\n", getprogname());
exit(1);
}
==== //depot/projects/dtrace/src/share/man/man4/aac.4#4 (text+ko) ====
@@ -22,8 +22,8 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/aac.4,v 1.33 2006/06/18 07:33:51 brueffer Exp $
-.Dd June 17, 2006
+.\" $FreeBSD: src/share/man/man4/aac.4,v 1.34 2006/11/03 06:50:03 brueffer Exp $
+.Dd November 3, 2006
.Dt AAC 4
.Os
.Sh NAME
@@ -181,6 +181,8 @@
.It
IBM ServeRAID 8i
.It
+IBM ServeRAID 8k
+.It
ICP ICP5085BR SAS RAID
.It
ICP ICP9085LI SAS RAID
More information about the p4-projects
mailing list