svn commit: r251180 - head/tools/regression/bin/sh/builtins
Author: jilles Date: Fri May 31 14:45:25 2013 New Revision: 251180 URL: http://svnweb.freebsd.org/changeset/base/251180 Log: sh: Add test cases for break outside a loop. In most shells (including our sh), break outside a loop does nothing with status 0, or at least does not abort. Therefore, scripts sometimes (buggily) depend on this. Added: head/tools/regression/bin/sh/builtins/break4.4 (contents, props changed) head/tools/regression/bin/sh/builtins/break5.4 (contents, props changed) Added: head/tools/regression/bin/sh/builtins/break4.4 == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/bin/sh/builtins/break4.4 Fri May 31 14:45:25 2013(r251180) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +# Although this is not specified by POSIX, some configure scripts (gawk 4.1.0) +# appear to depend on it. + +break +exit 4 Added: head/tools/regression/bin/sh/builtins/break5.4 == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/bin/sh/builtins/break5.4 Fri May 31 14:45:25 2013(r251180) @@ -0,0 +1,12 @@ +# $FreeBSD$ + +# Although this is not specified by POSIX, some configure scripts (gawk 4.1.0) +# appear to depend on it. +# In some uncommitted code, the subshell environment corrupted the outer +# shell environment's state. + +(for i in a b c; do + exit 3 +done) +break +exit 4 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r251181 - head/lib/libc/sys
Author: jilles Date: Fri May 31 14:48:37 2013 New Revision: 251181 URL: http://svnweb.freebsd.org/changeset/base/251181 Log: fork(2): #include is not needed. Modified: head/lib/libc/sys/fork.2 Modified: head/lib/libc/sys/fork.2 == --- head/lib/libc/sys/fork.2Fri May 31 14:45:25 2013(r251180) +++ head/lib/libc/sys/fork.2Fri May 31 14:48:37 2013(r251181) @@ -28,7 +28,7 @@ .\"@(#)fork.2 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd June 4, 1993 +.Dd May 31, 2013 .Dt FORK 2 .Os .Sh NAME @@ -37,7 +37,6 @@ .Sh LIBRARY .Lb libc .Sh SYNOPSIS -.In sys/types.h .In unistd.h .Ft pid_t .Fn fork void ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r251183 - head/sys/vm
Author: alc Date: Fri May 31 16:00:42 2013 New Revision: 251183 URL: http://svnweb.freebsd.org/changeset/base/251183 Log: Simplify the definition of vm_page_lock_assert(). There is no compelling reason to inline the implementation of vm_page_lock_assert() in the !KLD_MODULES case. Use the same implementation for both KLD_MODULES and !KLD_MODULES. Reviewed by: kib Modified: head/sys/vm/vm_page.h Modified: head/sys/vm/vm_page.h == --- head/sys/vm/vm_page.h Fri May 31 15:19:00 2013(r251182) +++ head/sys/vm/vm_page.h Fri May 31 16:00:42 2013(r251183) @@ -222,18 +222,17 @@ extern struct mtx_padalign pa_lock[]; #definevm_page_lock(m) vm_page_lock_KBI((m), LOCK_FILE, LOCK_LINE) #definevm_page_unlock(m) vm_page_unlock_KBI((m), LOCK_FILE, LOCK_LINE) #definevm_page_trylock(m) vm_page_trylock_KBI((m), LOCK_FILE, LOCK_LINE) -#if defined(INVARIANTS) -#definevm_page_lock_assert(m, a) \ -vm_page_lock_assert_KBI((m), (a), __FILE__, __LINE__) -#else -#definevm_page_lock_assert(m, a) -#endif #else /* !KLD_MODULE */ #definevm_page_lockptr(m) (PA_LOCKPTR(VM_PAGE_TO_PHYS((m #definevm_page_lock(m) mtx_lock(vm_page_lockptr((m))) #definevm_page_unlock(m) mtx_unlock(vm_page_lockptr((m))) #definevm_page_trylock(m) mtx_trylock(vm_page_lockptr((m))) -#definevm_page_lock_assert(m, a) mtx_assert(vm_page_lockptr((m)), (a)) +#endif +#if defined(INVARIANTS) +#definevm_page_lock_assert(m, a) \ +vm_page_lock_assert_KBI((m), (a), __FILE__, __LINE__) +#else +#definevm_page_lock_assert(m, a) #endif /* ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r251184 - head/sys/kern
Author: jhb
Date: Fri May 31 16:15:22 2013
New Revision: 251184
URL: http://svnweb.freebsd.org/changeset/base/251184
Log:
Style fixes to vn_ioctl().
Suggested by: bde
Modified:
head/sys/kern/vfs_vnops.c
Modified: head/sys/kern/vfs_vnops.c
==
--- head/sys/kern/vfs_vnops.c Fri May 31 16:00:42 2013(r251183)
+++ head/sys/kern/vfs_vnops.c Fri May 31 16:15:22 2013(r251184)
@@ -1355,31 +1355,32 @@ vn_ioctl(fp, com, data, active_cred, td)
struct ucred *active_cred;
struct thread *td;
{
- struct vnode *vp = fp->f_vnode;
struct vattr vattr;
+ struct vnode *vp;
int error;
- error = ENOTTY;
+ vp = fp->f_vnode;
switch (vp->v_type) {
- case VREG:
case VDIR:
- if (com == FIONREAD) {
+ case VREG:
+ switch (com) {
+ case FIONREAD:
vn_lock(vp, LK_SHARED | LK_RETRY);
error = VOP_GETATTR(vp, &vattr, active_cred);
VOP_UNLOCK(vp, 0);
- if (!error)
+ if (error == 0)
*(int *)data = vattr.va_size - fp->f_offset;
- } else if (com == FIONBIO || com == FIOASYNC) /* XXX */
- error = 0;
- else
- error = VOP_IOCTL(vp, com, data, fp->f_flag,
- active_cred, td);
- break;
-
+ return (error);
+ case FIONBIO:
+ case FIOASYNC:
+ return (0);
+ default:
+ return (VOP_IOCTL(vp, com, data, fp->f_flag,
+ active_cred, td));
+ }
default:
- break;
+ return (ENOTTY);
}
- return (error);
}
/*
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r251186 - head/usr.sbin/acpi/acpidump
Author: jkim
Date: Fri May 31 17:23:38 2013
New Revision: 251186
URL: http://svnweb.freebsd.org/changeset/base/251186
Log:
Fix a long standing logic bug introduced in r167814. The code was added to
get RSDP from loader(8) hint via kenv(2) but the bug nullified the new code
and we always fell back to the previous method, i. e., sysctlbyname(3).
MFC after:3 days
Modified:
head/usr.sbin/acpi/acpidump/acpi_user.c
Modified: head/usr.sbin/acpi/acpidump/acpi_user.c
==
--- head/usr.sbin/acpi/acpidump/acpi_user.c Fri May 31 17:01:53 2013
(r251185)
+++ head/usr.sbin/acpi/acpidump/acpi_user.c Fri May 31 17:23:38 2013
(r251186)
@@ -172,7 +172,7 @@ acpi_find_rsd_ptr(void)
addr = 0;
/* Attempt to use kenv or sysctl to find RSD PTR record. */
- if (kenv(KENV_GET, hint_acpi_0_rsdp, buf, 20) == 0)
+ if (kenv(KENV_GET, hint_acpi_0_rsdp, buf, 20) > 0)
addr = strtoul(buf, NULL, 0);
if (addr == 0) {
len = sizeof(addr);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r251187 - head/sys/dev/mpt
Author: delphij Date: Fri May 31 17:27:44 2013 New Revision: 251187 URL: http://svnweb.freebsd.org/changeset/base/251187 Log: Explicitly use a pair of parentheses to ensure correct evaluation ordering for bitwise operation. Submitted by: swildner (DragonFly) MFC after:2 weeks Modified: head/sys/dev/mpt/mpt_raid.c head/sys/dev/mpt/mpt_user.c Modified: head/sys/dev/mpt/mpt_raid.c == --- head/sys/dev/mpt/mpt_raid.c Fri May 31 17:23:38 2013(r251186) +++ head/sys/dev/mpt/mpt_raid.c Fri May 31 17:27:44 2013(r251187) @@ -605,7 +605,7 @@ mpt_issue_raid_req(struct mpt_softc *mpt MPI_pSGE_SET_FLAGS(se, (MPI_SGE_FLAGS_SIMPLE_ELEMENT | MPI_SGE_FLAGS_LAST_ELEMENT | MPI_SGE_FLAGS_END_OF_BUFFER | MPI_SGE_FLAGS_END_OF_LIST | - write ? MPI_SGE_FLAGS_HOST_TO_IOC : MPI_SGE_FLAGS_IOC_TO_HOST)); + (write ? MPI_SGE_FLAGS_HOST_TO_IOC : MPI_SGE_FLAGS_IOC_TO_HOST))); se->FlagsLength = htole32(se->FlagsLength); rap->MsgContext = htole32(req->index | raid_handler_id); Modified: head/sys/dev/mpt/mpt_user.c == --- head/sys/dev/mpt/mpt_user.c Fri May 31 17:23:38 2013(r251186) +++ head/sys/dev/mpt/mpt_user.c Fri May 31 17:27:44 2013(r251187) @@ -548,8 +548,8 @@ mpt_user_raid_action(struct mpt_softc *m MPI_pSGE_SET_FLAGS(se, (MPI_SGE_FLAGS_SIMPLE_ELEMENT | MPI_SGE_FLAGS_LAST_ELEMENT | MPI_SGE_FLAGS_END_OF_BUFFER | MPI_SGE_FLAGS_END_OF_LIST | - raid_act->write ? MPI_SGE_FLAGS_HOST_TO_IOC : - MPI_SGE_FLAGS_IOC_TO_HOST)); + (raid_act->write ? MPI_SGE_FLAGS_HOST_TO_IOC : + MPI_SGE_FLAGS_IOC_TO_HOST))); } se->FlagsLength = htole32(se->FlagsLength); rap->MsgContext = htole32(req->index | user_handler_id); ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r251188 - head/contrib/telnet/telnetd
Author: marcel
Date: Fri May 31 17:30:12 2013
New Revision: 251188
URL: http://svnweb.freebsd.org/changeset/base/251188
Log:
Fix "automatic" login, broken by revision 69825 (12 years, 5 months ago).
The "automatic" login feature is described as follows:
The USER environment variable holds the name of the person telnetting in.
This is the username of the person on the client machine. The traditional
behaviour is to execute login(1) with this username first, meaning that
login(1) will prompt for the password only. If login fails, login(1) will
retry, but now prompt for the username before prompting for the password.
This feature got broken by how the environment got scrubbed. Before the
change in r69825 we removed variables that we deemed dangerous. Starting
with r69825 we only keep those variable we know to be safe.
The USER environment variable fell through the cracks. It suddenly got
scrubbed (i.e. removed from the environment) while still being checked
for. It also got explicitly removed from the environment to handle the
failed login case.
The fix is to obtain the value of the USER environment variable before
we scrub the environment and used the "cached" in subsequent checks.
This guarantees that the environment does not contain the USER variable
in the end, while still being able to implement "automatic" login.
Obtained from:Juniper Networks, Inc.
Modified:
head/contrib/telnet/telnetd/sys_term.c
Modified: head/contrib/telnet/telnetd/sys_term.c
==
--- head/contrib/telnet/telnetd/sys_term.c Fri May 31 17:27:44 2013
(r251187)
+++ head/contrib/telnet/telnetd/sys_term.c Fri May 31 17:30:12 2013
(r251188)
@@ -1,4 +1,4 @@
- /*
+/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
@@ -1026,6 +1026,10 @@ void
start_login(char *host undef1, int autologin undef1, char *name undef1)
{
char **argv;
+ char *user;
+
+ user = getenv("USER");
+ user = (user != NULL) ? strdup(user) : NULL;
scrub_env();
@@ -1160,9 +1164,9 @@ start_login(char *host undef1, int autol
# endif
} else
#endif
- if (getenv("USER")) {
+ if (user != NULL) {
argv = addarg(argv, "--");
- argv = addarg(argv, getenv("USER"));
+ argv = addarg(argv, user);
#ifdefined(LOGIN_ARGS) && defined(NO_LOGIN_P)
{
char **cpp;
@@ -1170,17 +1174,6 @@ start_login(char *host undef1, int autol
argv = addarg(argv, *cpp);
}
#endif
- /*
-* Assume that login will set the USER variable
-* correctly. For SysV systems, this means that
-* USER will no longer be set, just LOGNAME by
-* login. (The problem is that if the auto-login
-* fails, and the user then specifies a different
-* account name, he can get logged in with both
-* LOGNAME and USER in his environment, but the
-* USER value will be wrong.
-*/
- unsetenv("USER");
}
#ifdef AUTHENTICATION
#ifdefined(NO_LOGIN_F) && defined(LOGIN_R)
@@ -1190,6 +1183,9 @@ start_login(char *host undef1, int autol
#endif /* AUTHENTICATION */
closelog();
+ if (user != NULL)
+ free(user);
+
if (altlogin == NULL) {
altlogin = _PATH_LOGIN;
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r251190 - in head/usr.sbin/bsdconfig: . console mouse networking networking/share password/share security share share/media startup startup/share timezone timezone/share usermgmt usermg...
Author: dteske
Date: Fri May 31 19:07:17 2013
New Revision: 251190
URL: http://svnweb.freebsd.org/changeset/base/251190
Log:
Improve portion of the dialog(1) API in dialog.subr responsible for
calculating widget sizes. Instead of forking a sub-shell to calculate the
optimum size for a widget, use a byRef style call-out to set variables in
the parent namespace. For example, instead of:
size=$( f_dialog_buttonbox_size title btitle msg )
$DIALOG --title title --backtitle btitle --msgbox msg $size
The new API replaces the above with the following:
f_dialog_buttonbox_size height width title btitle msg
$DIALOG --title title --backtitle btitle --msgbox msg $height $width
This reduces the number of forks, improves performance, and makes the code
more readable by revealing the argument-order for widget sizing. It also
makes performing minor adjustments to the calculated values easier as
you no longer have to split-out the response (which required knowledge of
ordering so was counter-intuitive).
Modified:
head/usr.sbin/bsdconfig/bsdconfig
head/usr.sbin/bsdconfig/console/console
head/usr.sbin/bsdconfig/console/font
head/usr.sbin/bsdconfig/console/keymap
head/usr.sbin/bsdconfig/console/repeat
head/usr.sbin/bsdconfig/console/saver
head/usr.sbin/bsdconfig/console/screenmap
head/usr.sbin/bsdconfig/console/ttys
head/usr.sbin/bsdconfig/mouse/disable
head/usr.sbin/bsdconfig/mouse/mouse
head/usr.sbin/bsdconfig/mouse/port
head/usr.sbin/bsdconfig/mouse/type
head/usr.sbin/bsdconfig/networking/networking
head/usr.sbin/bsdconfig/networking/share/device.subr
head/usr.sbin/bsdconfig/networking/share/resolv.subr
head/usr.sbin/bsdconfig/password/share/password.subr
head/usr.sbin/bsdconfig/security/kern_securelevel
head/usr.sbin/bsdconfig/security/security
head/usr.sbin/bsdconfig/share/device.subr
head/usr.sbin/bsdconfig/share/dialog.subr
head/usr.sbin/bsdconfig/share/media/any.subr
head/usr.sbin/bsdconfig/share/media/ftp.subr
head/usr.sbin/bsdconfig/share/media/options.subr
head/usr.sbin/bsdconfig/share/mustberoot.subr
head/usr.sbin/bsdconfig/startup/misc
head/usr.sbin/bsdconfig/startup/rcadd
head/usr.sbin/bsdconfig/startup/rcconf
head/usr.sbin/bsdconfig/startup/rcdelete
head/usr.sbin/bsdconfig/startup/rcvar
head/usr.sbin/bsdconfig/startup/share/rcconf.subr
head/usr.sbin/bsdconfig/startup/startup
head/usr.sbin/bsdconfig/timezone/share/zones.subr
head/usr.sbin/bsdconfig/timezone/timezone
head/usr.sbin/bsdconfig/usermgmt/groupinput
head/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
head/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
head/usr.sbin/bsdconfig/usermgmt/userinput
head/usr.sbin/bsdconfig/usermgmt/usermgmt
Modified: head/usr.sbin/bsdconfig/bsdconfig
==
--- head/usr.sbin/bsdconfig/bsdconfig Fri May 31 18:27:21 2013
(r251189)
+++ head/usr.sbin/bsdconfig/bsdconfig Fri May 31 19:07:17 2013
(r251190)
@@ -145,7 +145,7 @@ dialog_menu_main()
local title="$DIALOG_TITLE"
local btitle="$DIALOG_BACKTITLE"
local prompt="$msg_menu_text"
- local menu_list size
+ local menu_list
menu_list="
'X' '$msg_exit' '$msg_exit_bsdconfig'
@@ -179,12 +179,13 @@ dialog_menu_main()
index=$(( $index + 1 ))
done
- size=$( eval f_dialog_menu_with_help_size \
- \"\$title\" \
- \"\$btitle\" \
- \"\$prompt\" \
- \"\" \
- $menu_list )
+ local height width rows
+ eval f_dialog_menu_with_help_size height width rows \
+ \"\$title\" \
+ \"\$btitle\" \
+ \"\$prompt\" \
+ \"\" \
+ $menu_list
local dialog_menu
dialog_menu=$( eval $DIALOG \
@@ -198,7 +199,9 @@ dialog_menu_main()
--help-label \"\$msg_help\" \
${USE_XDIALOG:+--help \"\"} \
--default-item \"\$DEFAULTITEM_$$\" \
- --menu \"\$prompt\" $size $menu_list\
+ --menu \"\$prompt\" \
+ $height $width $rows\
+ $menu_list \
2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
)
local retval=$?
Modified: head/usr.sbin/bsdconfig/console/console
==
--- head/usr.sbin/bsdconfig/console/console Fri May 31 18:27:21 2013
(r251189)
+++ head/usr.sbin/bsdconfig/console/console Fri May 31 19:07:17 2013
(r251190)
@@ -48,7 +48,7
svn commit: r251192 - head/include
Author: ed
Date: Fri May 31 20:07:26 2013
New Revision: 251192
URL: http://svnweb.freebsd.org/changeset/base/251192
Log:
Fix misspelling of structure field name.
Modified:
head/include/stdatomic.h
Modified: head/include/stdatomic.h
==
--- head/include/stdatomic.hFri May 31 19:13:22 2013(r251191)
+++ head/include/stdatomic.hFri May 31 20:07:26 2013(r251192)
@@ -123,7 +123,7 @@ enum memory_order {
#if defined(__CLANG_ATOMICS) || defined(__GNUC_ATOMICS)
#defineatomic_is_lock_free(obj) \
- __atomic_is_lock_free(sizeof((obj)->__val), &(obj)->val)
+ __atomic_is_lock_free(sizeof((obj)->__val), &(obj)->__val)
#else
#defineatomic_is_lock_free(obj) \
((void)(obj), sizeof((obj)->__val) <= sizeof(void *))
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r251194 - head/lib/libc/sys
Author: jilles Date: Fri May 31 20:46:08 2013 New Revision: 251194 URL: http://svnweb.freebsd.org/changeset/base/251194 Log: fork(2): Add information about fork() in multi-threaded processes. There is nothing about pthread_atfork(3) or extensions like calling malloc(3) in the child process as this may be unreliable or broken. Modified: head/lib/libc/sys/fork.2 Modified: head/lib/libc/sys/fork.2 == --- head/lib/libc/sys/fork.2Fri May 31 20:11:07 2013(r251193) +++ head/lib/libc/sys/fork.2Fri May 31 20:46:08 2013(r251194) @@ -73,6 +73,17 @@ are set to 0; see .It All interval timers are cleared; see .Xr setitimer 2 . +.It +The child process has only one thread, +corresponding to the calling thread in the parent process. +If the process has more than one thread, +locks and other resources held by the other threads are not released +and therefore only async-signal-safe functions +(see +.Xr sigaction 2 ) +are guaranteed to work in the child process until a call to +.Xr execve 2 +or a similar function. .El .Sh RETURN VALUES Upon successful completion, @@ -124,6 +135,7 @@ There is insufficient swap space for the .Xr rfork 2 , .Xr setitimer 2 , .Xr setrlimit 2 , +.Xr sigaction 2 , .Xr vfork 2 , .Xr wait 2 .Sh HISTORY ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r251195 - head/sys/dev/xen/blkfront
Author: gibbs
Date: Fri May 31 21:05:07 2013
New Revision: 251195
URL: http://svnweb.freebsd.org/changeset/base/251195
Log:
Style cleanups. No intended functional changes.
o This driver is the "xbd" driver, not the "blkfront", "blkif", "xbf", or
"xb" driver. Use the "xbd_" naming conventions for all functions,
structures, and constants.
o The prevailing convention for structure fields in this driver is to
prefix them with an abreviation of the structure type. Update
"recently added" fields to match this style.
o Remove unused data structures.
o Remove superfluous casts.
o Make a pass over the whole driver and bring it closer to
style(9) conformance.
Sponsored by: Spectra Logic Corporation
MFC after:1 week
Modified:
head/sys/dev/xen/blkfront/blkfront.c
head/sys/dev/xen/blkfront/block.h
Modified: head/sys/dev/xen/blkfront/blkfront.c
==
--- head/sys/dev/xen/blkfront/blkfront.cFri May 31 20:46:08 2013
(r251194)
+++ head/sys/dev/xen/blkfront/blkfront.cFri May 31 21:05:07 2013
(r251195)
@@ -1,6 +1,7 @@
/*
* XenBSD block device driver
*
+ * Copyright (c) 2010-2013 Spectra Logic Corporation
* Copyright (c) 2009 Scott Long, Yahoo!
* Copyright (c) 2009 Frank Suchomel, Citrix
* Copyright (c) 2009 Doug F. Rabson, Citrix
@@ -70,17 +71,17 @@ __FBSDID("$FreeBSD$");
#include "xenbus_if.h"
/* prototypes */
-static void xb_free_command(struct xb_command *cm);
-static void xb_startio(struct xb_softc *sc);
-static void blkfront_connect(struct xb_softc *);
-static void blkfront_closing(device_t);
-static int blkfront_detach(device_t);
-static int setup_blkring(struct xb_softc *);
-static void blkif_int(void *);
-static void blkfront_initialize(struct xb_softc *);
-static int blkif_completion(struct xb_command *);
-static void blkif_free(struct xb_softc *);
-static void blkif_queue_cb(void *, bus_dma_segment_t *, int, int);
+static void xbd_free_command(struct xbd_command *cm);
+static void xbd_startio(struct xbd_softc *sc);
+static void xbd_connect(struct xbd_softc *);
+static void xbd_closing(device_t);
+static int xbd_detach(device_t);
+static int xbd_setup_ring(struct xbd_softc *);
+static void xbd_int(void *);
+static void xbd_initialize(struct xbd_softc *);
+static int xbd_completion(struct xbd_command *);
+static void xbd_free(struct xbd_softc *);
+static void xbd_queue_cb(void *, bus_dma_segment_t *, int, int);
static MALLOC_DEFINE(M_XENBLOCKFRONT, "xbd", "Xen Block Front driver data");
@@ -93,18 +94,18 @@ static MALLOC_DEFINE(M_XENBLOCKFRONT, "x
static void vbd_update(void);
#endif
-#define BLKIF_STATE_DISCONNECTED 0
-#define BLKIF_STATE_CONNECTED1
-#define BLKIF_STATE_SUSPENDED2
+#define XBD_STATE_DISCONNECTED 0
+#define XBD_STATE_CONNECTED1
+#define XBD_STATE_SUSPENDED2
#ifdef notyet
-static char *blkif_state_name[] = {
- [BLKIF_STATE_DISCONNECTED] = "disconnected",
- [BLKIF_STATE_CONNECTED]= "connected",
- [BLKIF_STATE_SUSPENDED]= "closed",
+static char *xbd_state_name[] = {
+ [XBD_STATE_DISCONNECTED] = "disconnected",
+ [XBD_STATE_CONNECTED]= "connected",
+ [XBD_STATE_SUSPENDED]= "closed",
};
-static char * blkif_status_name[] = {
+static char * xbd_status_name[] = {
[BLKIF_INTERFACE_STATUS_CLOSED] = "closed",
[BLKIF_INTERFACE_STATUS_DISCONNECTED] = "disconnected",
[BLKIF_INTERFACE_STATUS_CONNECTED]= "connected",
@@ -118,17 +119,17 @@ static char * blkif_status_name[] = {
#define DPRINTK(fmt, args...)
#endif
-static int blkif_open(struct disk *dp);
-static int blkif_close(struct disk *dp);
-static int blkif_ioctl(struct disk *dp, u_long cmd, void *addr, int flag,
struct thread *td);
-static int blkif_queue_request(struct xb_softc *sc, struct xb_command *cm);
-static void xb_strategy(struct bio *bp);
+static int xbd_open(struct disk *dp);
+static int xbd_close(struct disk *dp);
+static int xbd_ioctl(struct disk *dp, u_long cmd, void *addr, int flag, struct
thread *td);
+static int xbd_queue_request(struct xbd_softc *sc, struct xbd_command *cm);
+static void xbd_strategy(struct bio *bp);
// In order to quiesce the device during kernel dumps, outstanding requests to
// DOM0 for disk reads/writes need to be accounted for.
-static int xb_dump(void *, void *, vm_offset_t, off_t, size_t);
+static int xbd_dump(void *, void *, vm_offset_t, off_t, size_t);
-/* XXX move to xb_vbd.c when VBD update support is added */
+/* XXX move to xbd_vbd.c when VBD update support is added */
#define MAX_VBDS 64
#define XBD_SECTOR_SIZE512 /* XXX: assume for now */
@@ -140,7 +141,7 @@ static int xb_dump(void *, void *, vm_of
* with blkfront as the emulated drives, easing transition slightly.
*/
static void
-blkfront_vdevice_to_unit(uint32_t vdevice, int *unit, const char **name)
+xbd
svn commit: r251196 - head/lib/libc/sys
Author: jilles Date: Fri May 31 21:25:51 2013 New Revision: 251196 URL: http://svnweb.freebsd.org/changeset/base/251196 Log: sigaction(2): Extend description of async-signal safe functions: * Improve description when unsafe functions are unsafe. * Add various safe functions from POSIX.1-2008 and Austin Group issue #692. Modified: head/lib/libc/sys/sigaction.2 Modified: head/lib/libc/sys/sigaction.2 == --- head/lib/libc/sys/sigaction.2 Fri May 31 21:05:07 2013 (r251195) +++ head/lib/libc/sys/sigaction.2 Fri May 31 21:25:51 2013 (r251196) @@ -28,7 +28,7 @@ .\"From: @(#)sigaction.2 8.2 (Berkeley) 4/3/94 .\" $FreeBSD$ .\" -.Dd September 27, 2012 +.Dd May 31, 2013 .Dt SIGACTION 2 .Os .Sh NAME @@ -346,13 +346,19 @@ Any attempt to do so will be silently ig The following functions are either reentrant or not interruptible by signals and are async-signal safe. Therefore applications may -invoke them, without restriction, from signal-catching functions: +invoke them, without restriction, from signal-catching functions +or from a child process after calling +.Xr fork 2 +in a multi-threaded process: .Pp Base Interfaces: .Pp +.Fn _Exit , .Fn _exit , +.Fn accept , .Fn access , .Fn alarm , +.Fn bind , .Fn cfgetispeed , .Fn cfgetospeed , .Fn cfsetispeed , @@ -361,41 +367,65 @@ Base Interfaces: .Fn chmod , .Fn chown , .Fn close , +.Fn connect , .Fn creat , .Fn dup , .Fn dup2 , +.Fn execl , .Fn execle , +.Fn execv , .Fn execve , +.Fn fchdir , +.Fn fchmod , +.Fn fchown , .Fn fcntl , .Fn fork , -.Fn fpathconf , .Fn fstat , .Fn fsync , +.Fn ftruncate , .Fn getegid , .Fn geteuid , .Fn getgid , .Fn getgroups , +.Fn getpeername , .Fn getpgrp , .Fn getpid , .Fn getppid , +.Fn getsockname , +.Fn getsockopt , .Fn getuid , .Fn kill , .Fn link , +.Fn listen , .Fn lseek , +.Fn lstat , .Fn mkdir , .Fn mkfifo , +.Fn mknod , .Fn open , -.Fn pathconf , .Fn pause , .Fn pipe , +.Fn poll , +.Fn pselect , +.Fn pthread_sigmask , .Fn raise , .Fn read , +.Fn readlink , +.Fn recv , +.Fn recvfrom , +.Fn recvmsg , .Fn rename , .Fn rmdir , +.Fn select , +.Fn send , +.Fn sendmsg , +.Fn sendto , .Fn setgid , .Fn setpgid , .Fn setsid , +.Fn setsockopt , .Fn setuid , +.Fn shutdown , .Fn sigaction , .Fn sigaddset , .Fn sigdelset , @@ -407,8 +437,11 @@ Base Interfaces: .Fn sigprocmask , .Fn sigsuspend , .Fn sleep , +.Fn sockatmark , +.Fn socket , +.Fn socketpair , .Fn stat , -.Fn sysconf , +.Fn symlink , .Fn tcdrain , .Fn tcflow , .Fn tcflush , @@ -427,11 +460,16 @@ Base Interfaces: .Fn waitpid , .Fn write . .Pp +X/Open Systems Interfaces: +.Pp +.Fn sigpause , +.Fn sigset , +.Fn utimes . +.Pp Realtime Interfaces: .Pp .Fn aio_error , .Fn clock_gettime , -.Fn sigpause , .Fn timer_getoverrun , .Fn aio_return , .Fn fdatasync , @@ -439,27 +477,84 @@ Realtime Interfaces: .Fn timer_gettime , .Fn aio_suspend , .Fn sem_post , -.Fn sigset , .Fn timer_settime . .Pp -.Tn ANSI C -Interfaces: +Base Interfaces not specified as async-signal safe by +.Tn POSIX : .Pp -.Fn strcpy , +.Fn fpathconf , +.Fn pathconf , +.Fn sysconf . +.Pp +Base Interfaces not specified as async-signal safe by +.Tn POSIX , +but planned to be: +.Pp +.Fn ffs , +.Fn htonl , +.Fn htons , +.Fn memccpy , +.Fn memchr , +.Fn memcmp , +.Fn memcpy , +.Fn memmove , +.Fn memset , +.Fn ntohl , +.Fn ntohs , +.Fn stpcpy , +.Fn stpncpy , .Fn strcat , -.Fn strncpy , +.Fn strchr , +.Fn strcmp , +.Fn strcpy , +.Fn strcspn , +.Fn strlen , .Fn strncat , -and perhaps some others. +.Fn strncmp , +.Fn strncpy , +.Fn strnlen , +.Fn strpbrk , +.Fn strrchr , +.Fn strspn , +.Fn strstr , +.Fn strtok_r , +.Fn wcpcpy , +.Fn wcpncpy , +.Fn wcscat , +.Fn wcschr , +.Fn wcscmp , +.Fn wcscpy , +.Fn wcscspn , +.Fn wcslen , +.Fn wcsncat , +.Fn wcsncmp , +.Fn wcsncpy , +.Fn wcsnlen , +.Fn wcspbrk , +.Fn wcsrchr , +.Fn wcsspn , +.Fn wcsstr , +.Fn wcstok , +.Fn wmemchr , +.Fn wmemcmp , +.Fn wmemcpy , +.Fn wmemmove , +.Fn wmemset . .Pp Extension Interfaces: .Pp .Fn strlcpy , .Fn strlcat . .Pp +In addition, reading or writing +.Va errno +is async-signal safe. +.Pp All functions not in the above lists are considered to be unsafe with respect to signals. That is to say, the behaviour of such -functions when called from a signal handler is undefined. +functions is undefined when they are called from a signal handler +that interrupted an unsafe function. In general though, signal handlers should do little more than set a flag; most other actions are not safe. .Pp ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r251197 - head/lib/libc/sys
Author: jilles Date: Fri May 31 21:31:38 2013 New Revision: 251197 URL: http://svnweb.freebsd.org/changeset/base/251197 Log: sigaction(2): *at system calls are async-signal safe. Modified: head/lib/libc/sys/sigaction.2 Modified: head/lib/libc/sys/sigaction.2 == --- head/lib/libc/sys/sigaction.2 Fri May 31 21:25:51 2013 (r251196) +++ head/lib/libc/sys/sigaction.2 Fri May 31 21:31:38 2013 (r251197) @@ -375,12 +375,16 @@ Base Interfaces: .Fn execle , .Fn execv , .Fn execve , +.Fn faccessat , .Fn fchdir , .Fn fchmod , +.Fn fchmodat , .Fn fchown , +.Fn fchownat , .Fn fcntl , .Fn fork , .Fn fstat , +.Fn fstatat , .Fn fsync , .Fn ftruncate , .Fn getegid , @@ -396,13 +400,18 @@ Base Interfaces: .Fn getuid , .Fn kill , .Fn link , +.Fn linkat , .Fn listen , .Fn lseek , .Fn lstat , .Fn mkdir , +.Fn mkdirat , .Fn mkfifo , +.Fn mkfifoat , .Fn mknod , +.Fn mknodat , .Fn open , +.Fn openat , .Fn pause , .Fn pipe , .Fn poll , @@ -411,10 +420,12 @@ Base Interfaces: .Fn raise , .Fn read , .Fn readlink , +.Fn readlinkat , .Fn recv , .Fn recvfrom , .Fn recvmsg , .Fn rename , +.Fn renameat , .Fn rmdir , .Fn select , .Fn send , @@ -442,6 +453,7 @@ Base Interfaces: .Fn socketpair , .Fn stat , .Fn symlink , +.Fn symlinkat , .Fn tcdrain , .Fn tcflow , .Fn tcflush , @@ -455,6 +467,7 @@ Base Interfaces: .Fn umask , .Fn uname , .Fn unlink , +.Fn unlinkat , .Fn utime , .Fn wait , .Fn waitpid , @@ -543,6 +556,7 @@ but planned to be: .Pp Extension Interfaces: .Pp +.Fn futimesat , .Fn strlcpy , .Fn strlcat . .Pp ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r251198 - head/sys/compat/freebsd32
Author: obrien
Date: Fri May 31 21:43:17 2013
New Revision: 251198
URL: http://svnweb.freebsd.org/changeset/base/251198
Log:
Add a "kern.features" MIB for 32bit support under a 64bit kernel.
Modified:
head/sys/compat/freebsd32/freebsd32_misc.c
Modified: head/sys/compat/freebsd32/freebsd32_misc.c
==
--- head/sys/compat/freebsd32/freebsd32_misc.c Fri May 31 21:31:38 2013
(r251197)
+++ head/sys/compat/freebsd32/freebsd32_misc.c Fri May 31 21:43:17 2013
(r251198)
@@ -104,6 +104,8 @@ __FBSDID("$FreeBSD$");
#include
#include
+FEATURE(compat_freebsd_32bit, "Compatible with 32-bit FreeBSD");
+
#ifndef __mips__
CTASSERT(sizeof(struct timeval32) == 8);
CTASSERT(sizeof(struct timespec32) == 8);
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r251203 - head/lib/libc/sys
Author: jilles Date: Fri May 31 22:09:31 2013 New Revision: 251203 URL: http://svnweb.freebsd.org/changeset/base/251203 Log: dup(2): Clarify return value, in particular of dup2(). Modified: head/lib/libc/sys/dup.2 Modified: head/lib/libc/sys/dup.2 == --- head/lib/libc/sys/dup.2 Fri May 31 22:08:25 2013(r251202) +++ head/lib/libc/sys/dup.2 Fri May 31 22:09:31 2013(r251203) @@ -28,7 +28,7 @@ .\" @(#)dup.2 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd April 21, 2013 +.Dd June 1, 2013 .Dt DUP 2 .Os .Sh NAME @@ -113,10 +113,11 @@ is a valid descriptor, then .Fn dup2 is successful, and does nothing. .Sh RETURN VALUES -The value -1 is returned if an error occurs in either call. -The external variable +These calls return the new file descriptor if successful; +otherwise the value -1 is returned and +the external variable .Va errno -indicates the cause of the error. +is set to indicate the cause of the error. .Sh ERRORS The .Fn dup ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r251204 - head/sys/dev/xen/blkfront
Author: gibbs
Date: Fri May 31 22:21:37 2013
New Revision: 251204
URL: http://svnweb.freebsd.org/changeset/base/251204
Log:
Style cleanups. No intended functional changes.
o Group functions by by their functionality.
o Remove superfluous declarations.
o Remove more unused (#ifdef'd out) code.
Sponsored by: Spectra Logic Corporation
Modified:
head/sys/dev/xen/blkfront/blkfront.c
Modified: head/sys/dev/xen/blkfront/blkfront.c
==
--- head/sys/dev/xen/blkfront/blkfront.cFri May 31 22:09:31 2013
(r251203)
+++ head/sys/dev/xen/blkfront/blkfront.cFri May 31 22:21:37 2013
(r251204)
@@ -70,20 +70,22 @@ __FBSDID("$FreeBSD$");
#include "xenbus_if.h"
-/* prototypes */
-static void xbd_free_command(struct xbd_command *cm);
-static void xbd_startio(struct xbd_softc *sc);
-static void xbd_connect(struct xbd_softc *);
+/*--- Forward Declarations
---*/
static void xbd_closing(device_t);
-static int xbd_detach(device_t);
-static int xbd_setup_ring(struct xbd_softc *);
-static void xbd_int(void *);
-static void xbd_initialize(struct xbd_softc *);
-static int xbd_completion(struct xbd_command *);
-static void xbd_free(struct xbd_softc *);
-static void xbd_queue_cb(void *, bus_dma_segment_t *, int, int);
+static void xbd_startio(struct xbd_softc *sc);
-static MALLOC_DEFINE(M_XENBLOCKFRONT, "xbd", "Xen Block Front driver data");
+/*-- Macros
--*/
+#if 0
+#define DPRINTK(fmt, args...) printf("[XEN] %s:%d: " fmt ".\n", __func__,
__LINE__, ##args)
+#else
+#define DPRINTK(fmt, args...)
+#endif
+
+/* XXX move to xbd_vbd.c when VBD update support is added */
+#define MAX_VBDS 64
+
+#define XBD_SECTOR_SIZE512 /* XXX: assume for now */
+#define XBD_SECTOR_SHFT9
#define GRANT_INVALID_REF 0
@@ -98,199 +100,361 @@ static void vbd_update(void);
#define XBD_STATE_CONNECTED1
#define XBD_STATE_SUSPENDED2
-#ifdef notyet
-static char *xbd_state_name[] = {
- [XBD_STATE_DISCONNECTED] = "disconnected",
- [XBD_STATE_CONNECTED]= "connected",
- [XBD_STATE_SUSPENDED]= "closed",
-};
-
-static char * xbd_status_name[] = {
- [BLKIF_INTERFACE_STATUS_CLOSED] = "closed",
- [BLKIF_INTERFACE_STATUS_DISCONNECTED] = "disconnected",
- [BLKIF_INTERFACE_STATUS_CONNECTED]= "connected",
- [BLKIF_INTERFACE_STATUS_CHANGED] = "changed",
-};
-#endif
-
-#if 0
-#define DPRINTK(fmt, args...) printf("[XEN] %s:%d: " fmt ".\n", __func__,
__LINE__, ##args)
-#else
-#define DPRINTK(fmt, args...)
-#endif
+/* Global Static Data
*/
+static MALLOC_DEFINE(M_XENBLOCKFRONT, "xbd", "Xen Block Front driver data");
-static int xbd_open(struct disk *dp);
-static int xbd_close(struct disk *dp);
-static int xbd_ioctl(struct disk *dp, u_long cmd, void *addr, int flag, struct
thread *td);
-static int xbd_queue_request(struct xbd_softc *sc, struct xbd_command *cm);
-static void xbd_strategy(struct bio *bp);
-
-// In order to quiesce the device during kernel dumps, outstanding requests to
-// DOM0 for disk reads/writes need to be accounted for.
-static int xbd_dump(void *, void *, vm_offset_t, off_t, size_t);
+/* Command Processing
*/
+static inline void
+flush_requests(struct xbd_softc *sc)
+{
+ int notify;
-/* XXX move to xbd_vbd.c when VBD update support is added */
-#define MAX_VBDS 64
+ RING_PUSH_REQUESTS_AND_CHECK_NOTIFY(&sc->xbd_ring, notify);
-#define XBD_SECTOR_SIZE512 /* XXX: assume for now */
-#define XBD_SECTOR_SHFT9
+ if (notify)
+ notify_remote_via_irq(sc->xbd_irq);
+}
-/*
- * Translate Linux major/minor to an appropriate name and unit
- * number. For HVM guests, this allows us to use the same drive names
- * with blkfront as the emulated drives, easing transition slightly.
- */
static void
-xbd_vdevice_to_unit(uint32_t vdevice, int *unit, const char **name)
+xbd_free_command(struct xbd_command *cm)
{
- static struct vdev_info {
- int major;
- int shift;
- int base;
- const char *name;
- } info[] = {
- {3, 6, 0, "ada"}, /* ide0 */
- {22,6, 2, "ada"}, /* ide1 */
- {33,6, 4, "ada"}, /* ide2 */
- {34,6, 6, "ada"}, /* ide3 */
- {56,6, 8, "ada"}, /* ide4 */
- {57,6, 10, "ada"}, /* ide5 */
- {88,6, 12, "ada"}, /* ide6 */
- {89,6, 14, "ada"}, /* ide7 */
- {90,6, 16, "ada"}, /* ide8 */
- {91,6,
svn commit: r251206 - head/sys/dev/xen/blkfront
Author: gibbs
Date: Fri May 31 22:33:28 2013
New Revision: 251206
URL: http://svnweb.freebsd.org/changeset/base/251206
Log:
Style changes. No intended functional changes.
o rename flush_requests => xbd_flush_requests
o rename xbd_setup_ring => xbd_alloc_ring
Sponsored by: Spectra Logic Corporation
MFC after:1 week
Modified:
head/sys/dev/xen/blkfront/blkfront.c
Modified: head/sys/dev/xen/blkfront/blkfront.c
==
--- head/sys/dev/xen/blkfront/blkfront.cFri May 31 22:23:17 2013
(r251205)
+++ head/sys/dev/xen/blkfront/blkfront.cFri May 31 22:33:28 2013
(r251206)
@@ -105,7 +105,7 @@ static MALLOC_DEFINE(M_XENBLOCKFRONT, "x
/* Command Processing
*/
static inline void
-flush_requests(struct xbd_softc *sc)
+xbd_flush_requests(struct xbd_softc *sc)
{
int notify;
@@ -232,7 +232,7 @@ xbd_queue_cb(void *arg, bus_dma_segment_
* instead of in the startio context, so an explicit flush is needed.
*/
if (cm->cm_flags & XBD_CMD_FROZEN)
- flush_requests(sc);
+ xbd_flush_requests(sc);
return;
}
@@ -344,7 +344,7 @@ xbd_startio(struct xbd_softc *sc)
}
if (queued != 0)
- flush_requests(sc);
+ xbd_flush_requests(sc);
}
static void
@@ -640,7 +640,7 @@ xbd_strategy(struct bio *bp)
/*-- Ring Management
-*/
static int
-xbd_setup_ring(struct xbd_softc *sc)
+xbd_alloc_ring(struct xbd_softc *sc)
{
blkif_sring_t *sring;
uintptr_t sring_page_addr;
@@ -1071,7 +1071,7 @@ xbd_initialize(struct xbd_softc *sc)
xbd_free_command(cm);
}
- if (xbd_setup_ring(sc) != 0)
+ if (xbd_alloc_ring(sc) != 0)
return;
/* Support both backend schemes for relaying ring page limits. */
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r251208 - in head: bin/test tools/regression/bin/test
Author: jilles
Date: Fri May 31 22:54:20 2013
New Revision: 251208
URL: http://svnweb.freebsd.org/changeset/base/251208
Log:
test: Remove -ntXY and -otXY primaries.
This reverts commit r247274.
As maintainer of sh, I disapprove of this feature addition.
It is too specific and can be done without easily using find(1) or stat(1).
I will add some hints to the test(1) man page shortly.
In general, FreeBSD sh is not the place to invent new shell language
features. This is how it has been maintained and adding features randomly
does not work with that.
The new syntax (e.g. [ FILE1 -ntca FILE2 ]) looks cryptic to me.
Modified:
head/bin/test/test.1
head/bin/test/test.c
head/tools/regression/bin/test/regress.sh
Modified: head/bin/test/test.1
==
--- head/bin/test/test.1Fri May 31 22:53:44 2013(r251207)
+++ head/bin/test/test.1Fri May 31 22:54:20 2013(r251208)
@@ -169,65 +169,15 @@ True if
.Ar file
exists and is a socket.
.It Ar file1 Fl nt Ar file2
-True if both
-.Ar file1
-and
-.Ar file2
-exist and
-.Ar file1
-is newer than
-.Ar file2 .
-.It Ar file1 Fl nt Ns Ar X Ns Ar Y Ar file2
-True if both
-.Ar file1
-and
-.Ar file2
-exist and
+True if
.Ar file1
-has a more recent last access time
-.Pq Ar X Ns = Ns Cm a ,
-inode creation time
-.Pq Ar X Ns = Ns Cm b ,
-change time
-.Pq Ar X Ns = Ns Cm c ,
-or modification time
-.Pq Ar X Ns = Ns Cm m
-than the last access time
-.Pq Ar Y Ns = Ns Cm a ,
-inode creation time
-.Pq Ar Y Ns = Ns Cm b ,
-change time
-.Pq Ar Y Ns = Ns Cm c ,
-or modification time
-.Pq Ar Y Ns = Ns Cm m
-of
+exists and is newer than
.Ar file2 .
-Note that
-.Ic -ntmm
-is equivalent to
-.Ic -nt .
.It Ar file1 Fl ot Ar file2
-True if both
-.Ar file1
-and
-.Ar file2
-exist and
+True if
.Ar file1
-is older than
+exists and is older than
.Ar file2 .
-Note that
-.Ar file1
-.Ic -ot
-.Ar file2
-is equivalent to
-.Ar file2
-.Ic -nt
-.Ar file1
-.It Ar file1 Fl ot Ns Ar X Ns Ar Y Ar file2
-Equivalent to
-.Ar file2
-.Ic -nt Ns Ar Y Ns Ar X
-.Ar file1 .
.It Ar file1 Fl ef Ar file2
True if
.Ar file1
Modified: head/bin/test/test.c
==
--- head/bin/test/test.cFri May 31 22:53:44 2013(r251207)
+++ head/bin/test/test.cFri May 31 22:54:20 2013(r251208)
@@ -63,7 +63,7 @@ error(const char *msg, ...)
"-u"|"-g"|"-k"|"-s"|"-t"|"-z"|"-n"|"-o"|"-O"|"-G"|"-L"|"-S";
binary-operator ::= "="|"!="|"-eq"|"-ne"|"-ge"|"-gt"|"-le"|"-lt"|
- "-nt"|"-nt[abcm][abcm]"|"-ot"|"-ot[abcm][abcm])"|"-ef";
+ "-nt"|"-ot"|"-ef";
operand ::=
*/
@@ -85,38 +85,8 @@ enum token {
FILSUID,
FILSGID,
FILSTCK,
- FILNTAA,
- FILNTAB,
- FILNTAC,
- FILNTAM,
- FILNTBA,
- FILNTBB,
- FILNTBC,
- FILNTBM,
- FILNTCA,
- FILNTCB,
- FILNTCC,
- FILNTCM,
- FILNTMA,
- FILNTMB,
- FILNTMC,
- FILNTMM,
- FILOTAA,
- FILOTAB,
- FILOTAC,
- FILOTAM,
- FILOTBA,
- FILOTBB,
- FILOTBC,
- FILOTBM,
- FILOTCA,
- FILOTCB,
- FILOTCC,
- FILOTCM,
- FILOTMA,
- FILOTMB,
- FILOTMC,
- FILOTMM,
+ FILNT,
+ FILOT,
FILEQ,
FILUID,
FILGID,
@@ -148,16 +118,9 @@ enum token_types {
PAREN
};
-enum time_types {
- ATIME,
- BTIME,
- CTIME,
- MTIME
-};
-
static struct t_op {
- char op_text[6];
- char op_num, op_type;
+ char op_text[4];
+ short op_num, op_type;
} const ops [] = {
{"-r", FILRD, UNOP},
{"-w", FILWR, UNOP},
@@ -191,40 +154,8 @@ static struct t_op {
{"-gt", INTGT, BINOP},
{"-le", INTLE, BINOP},
{"-lt", INTLT, BINOP},
- {"-nt", FILNTMM,BINOP},
- {"-ntaa", FILNTAA,BINOP},
- {"-ntab", FILNTAB,BINOP},
- {"-ntac", FILNTAC,BINOP},
- {"-ntam", FILNTAM,BINOP},
- {"-ntba", FILNTBA,BINOP},
- {"-ntbb", FILNTBB,BINOP},
- {"-ntbc", FILNTBC,BINOP},
- {"-ntbm", FILNTBM,BINOP},
- {"-ntca", FILNTCA,BINOP},
- {"-ntcb", FILNTCB,BINOP},
- {"-ntcc", FILNTCC,BINOP},
- {"-ntcm", FILNTCM,BINOP},
- {"-ntma", FILNTMA,BINOP},
- {"-ntmb", FILNTMB,BINOP},
- {"-ntmc", FILNTMC,BINOP},
- {"-ntmm", FILNTMM,BINOP},
- {"-ot", FILOTMM,BINOP},
- {"-otaa", FILOTAA,BINOP},
- {"-otab", FILOTBB,BINOP},
- {"-otac", FILOTAC,BINOP},
- {"-otam
svn commit: r251209 - head/bin/test
Author: jilles Date: Fri May 31 22:55:21 2013 New Revision: 251209 URL: http://svnweb.freebsd.org/changeset/base/251209 Log: test(1): List non-standard primaries. Modified: head/bin/test/test.1 Modified: head/bin/test/test.1 == --- head/bin/test/test.1Fri May 31 22:54:20 2013(r251208) +++ head/bin/test/test.1Fri May 31 22:55:21 2013(r251209) @@ -32,7 +32,7 @@ .\" @(#)test.1 8.1 (Berkeley) 5/31/93 .\" $FreeBSD$ .\" -.Dd December 27, 2012 +.Dd June 1, 2013 .Dt TEST 1 .Os .Sh NAME @@ -349,6 +349,17 @@ The utility implements a superset of the .St -p1003.2 specification. +The primaries +.Cm < , +.Cm == , +.Cm > , +.Fl ef , +.Fl nt , +.Fl ot , +.Fl G , +and +.Fl O +are extensions. .Sh BUGS Both sides are always evaluated in .Fl a ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r251210 - head/contrib/tcpdump
Author: delphij
Date: Fri May 31 22:55:23 2013
New Revision: 251210
URL: http://svnweb.freebsd.org/changeset/base/251210
Log:
MFV: Redo the fixup using the submitted version accepted by upstream.
Modified:
head/contrib/tcpdump/print-rip.c
Directory Properties:
head/contrib/tcpdump/ (props changed)
Modified: head/contrib/tcpdump/print-rip.c
==
--- head/contrib/tcpdump/print-rip.cFri May 31 22:55:21 2013
(r251209)
+++ head/contrib/tcpdump/print-rip.cFri May 31 22:55:23 2013
(r251210)
@@ -17,8 +17,6 @@
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- *
- * $FreeBSD$
*/
#ifndef lint
@@ -143,7 +141,7 @@ rip_entry_print_v2(register const struct
putchar (isprint(*p) ? *p : '.');
} else if (auth_type == 3) {
printf("\n\t Auth header:");
- printf(" Packet Len %u,", EXTRACT_16BITS((u_int16_t
*)ni + 2));
+ printf(" Packet Len %u,", EXTRACT_16BITS((u_int8_t *)ni
+ 4));
printf(" Key-ID %u,", *((u_int8_t *)ni + 6));
printf(" Auth Data Len %u,", *((u_int8_t *)ni + 7));
printf(" SeqNo %u,",
EXTRACT_32BITS(&ni->rip_dest_mask));
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r251211 - head/bin/test
Author: jilles Date: Fri May 31 22:57:04 2013 New Revision: 251211 URL: http://svnweb.freebsd.org/changeset/base/251211 Log: test(1): Add information about replacing -nt/-ot. Modified: head/bin/test/test.1 Modified: head/bin/test/test.1 == --- head/bin/test/test.1Fri May 31 22:55:23 2013(r251210) +++ head/bin/test/test.1Fri May 31 22:57:04 2013(r251211) @@ -331,6 +331,20 @@ missing. .It >1 An error occurred. .El +.Sh EXAMPLES +Implement +.Li test FILE1 -nt FILE2 +using only +.Tn POSIX +functionality: +.Pp +.Dl test -n \&"$(find -L -- FILE1 -prune -newer FILE2 2>/dev/null)\&" +.Pp +This can be modified using non-standard +.Xr find 1 +primaries like +.Cm -newerca +to compare other timestamps. .Sh COMPATIBILITY For compatibility with some other implementations, the @@ -341,7 +355,9 @@ with the same meaning. .Sh SEE ALSO .Xr builtin 1 , .Xr expr 1 , +.Xr find 1 , .Xr sh 1 , +.Xr stat 1 , .Xr symlink 7 .Sh STANDARDS The ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r251197 - head/lib/libc/sys
On Fri, May 31, 2013 at 09:31:38PM +, Jilles Tjoelker wrote: > Author: jilles > Date: Fri May 31 21:31:38 2013 > New Revision: 251197 > URL: http://svnweb.freebsd.org/changeset/base/251197 > > Log: > sigaction(2): *at system calls are async-signal safe. Isn't chflags(2) family safe as well? -- Pawel Jakub Dawidek http://www.wheelsystems.com FreeBSD committer http://www.FreeBSD.org Am I Evil? Yes, I Am! http://mobter.com pgpwEnuidtJWH.pgp Description: PGP signature
svn commit: r251212 - in head/contrib/gcc: . config/i386 doc
Author: pfg Date: Sat Jun 1 01:02:24 2013 New Revision: 251212 URL: http://svnweb.freebsd.org/changeset/base/251212 Log: GCC: bring back experimental support for amdfam10/barcelona CPUs. Initial support for the AMD amdfam10 chipsets has been available in the gcc43 branch under GPLv2. AMD and some linux distributions (OpenSUSE) did a backport of the amdfam10 support and made it available. This is a revised subset of the support initially brought in in r236962 and later reverted. The collateral efects seem to have disappeared but it is still recommended to set the CPUTYPE with caution. Reviewed by: jkim (ages ago) MFC after:3 weeks Added: head/contrib/gcc/config/i386/ammintrin.h (contents, props changed) Modified: head/contrib/gcc/ChangeLog.gcc43 head/contrib/gcc/config.gcc head/contrib/gcc/config/i386/athlon.md head/contrib/gcc/config/i386/driver-i386.c head/contrib/gcc/config/i386/emmintrin.h head/contrib/gcc/config/i386/i386.c head/contrib/gcc/config/i386/i386.h head/contrib/gcc/config/i386/i386.md head/contrib/gcc/config/i386/i386.opt head/contrib/gcc/config/i386/pmmintrin.h head/contrib/gcc/config/i386/sse.md head/contrib/gcc/config/i386/tmmintrin.h head/contrib/gcc/doc/extend.texi head/contrib/gcc/doc/invoke.texi Modified: head/contrib/gcc/ChangeLog.gcc43 == --- head/contrib/gcc/ChangeLog.gcc43Fri May 31 22:57:04 2013 (r251211) +++ head/contrib/gcc/ChangeLog.gcc43Sat Jun 1 01:02:24 2013 (r251212) @@ -1,3 +1,8 @@ +2007-05-01 Dwarakanath Rajagopal (r124341) + + * doc/invoke.texi: Fix typo, 'AMD Family 10h core' instead of + 'AMD Family 10 core'. + 2007-05-01 Dwarakanath Rajagopal (r124339) * config/i386/i386.c (override_options): Accept k8-sse3, opteron-sse3 @@ -5,6 +10,12 @@ with SSE3 instruction set support. * doc/invoke.texi: Likewise. +2007-05-01 Dwarakanath Rajagopal (r124330) + + * config/i386/i386.c (override_options): Tuning 32-byte loop + alignment for amdfam10 architecture. Increasing the max loop + alignment to 24 bytes. + 2007-04-12 Richard Guenther (r123736) PR tree-optimization/24689 @@ -21,6 +32,17 @@ * config/i386/i386.c (ix86_handle_option): Handle SSSE3. +2007-03-28 Dwarakanath Rajagopal (r123313) + + * config.gcc: Accept barcelona as a variant of amdfam10. + * config/i386/i386.c (override_options): Likewise. + * doc/invoke.texi: Likewise. + +2007-02-09 Dwarakanath Rajagopal (r121763) + + * config/i386/driver-i386.c: Turn on -mtune=native for AMDFAM10. + (bit_SSE4a): New. + 2007-02-08 Harsha Jagasia (r121726) * config/i386/xmmintrin.h: Make inclusion of emmintrin.h @@ -38,6 +60,168 @@ * config/i386/i386.c (override_options): Set PTA_SSSE3 for core2. +2007-02-05 Harsha Jagasia (r121625) + + * config/i386/athlon.md (athlon_fldxf_k8, athlon_fld_k8, + athlon_fstxf_k8, athlon_fst_k8, athlon_fist, athlon_fmov, + athlon_fadd_load, athlon_fadd_load_k8, athlon_fadd, athlon_fmul, + athlon_fmul_load, athlon_fmul_load_k8, athlon_fsgn, + athlon_fdiv_load, athlon_fdiv_load_k8, athlon_fdiv_k8, + athlon_fpspc_load, athlon_fpspc, athlon_fcmov_load, + athlon_fcmov_load_k8, athlon_fcmov_k8, athlon_fcomi_load_k8, + athlon_fcomi, athlon_fcom_load_k8, athlon_fcom): Added amdfam10. + +2007-02-05 Harsha Jagasia (r121625) + + * config/i386/i386.md (x86_sahf_1, cmpfp_i_mixed, cmpfp_i_sse, + cmpfp_i_i387, cmpfp_iu_mixed, cmpfp_iu_sse, cmpfp_iu_387, + swapsi, swaphi_1, swapqi_1, swapdi_rex64, fix_truncsfdi_sse, + fix_truncdfdi_sse, fix_truncsfsi_sse, fix_truncdfsi_sse, + x86_fldcw_1, floatsisf2_mixed, floatsisf2_sse, floatdisf2_mixed, + floatdisf2_sse, floatsidf2_mixed, floatsidf2_sse, + floatdidf2_mixed, floatdidf2_sse, muldi3_1_rex64, mulsi3_1, + mulsi3_1_zext, mulhi3_1, mulqi3_1, umulqihi3_1, mulqihi3_insn, + umulditi3_insn, umulsidi3_insn, mulditi3_insn, mulsidi3_insn, + umuldi3_highpart_rex64, umulsi3_highpart_insn, + umulsi3_highpart_zext, smuldi3_highpart_rex64, + smulsi3_highpart_insn, smulsi3_highpart_zext, x86_64_shld, + x86_shld_1, x86_64_shrd, sqrtsf2_mixed, sqrtsf2_sse, + sqrtsf2_i387, sqrtdf2_mixed, sqrtdf2_sse, sqrtdf2_i387, + sqrtextendsfdf2_i387, sqrtxf2, sqrtextendsfxf2_i387, + sqrtextenddfxf2_i387): Added amdfam10_decode. + + * config/i386/athlon.md (athlon_idirect_amdfam10, + athlon_ivector_amdfam10, athlon_idirect_load_amdfam10, + athlon_ivector_load_amdfam10, athlon_idirect_both_amdfam10, + athlon_ivector_both_amdfam10, athlon_idirect_store_amdfam10, + athlon_ivector_store_amdfam10): New define_insn_reservation. + (athlon_idirect_loadmov, athlon_idirect_movstore): Added + amdfam1
svn commit: r251213 - head/sys/dev/cxgbe
Author: np
Date: Sat Jun 1 02:07:37 2013
New Revision: 251213
URL: http://svnweb.freebsd.org/changeset/base/251213
Log:
cxgbe(4): Some more debug sysctls. These work on both T4 and T5 based
cards.
dev.t5nex.0.misc.cim_ma_la: CIM MA logic analyzer
dev.t5nex.0.misc.cim_pif_la: CIM PIF logic analyzer
dev.t5nex.0.misc.mps_tcam: MPS TCAM entries
dev.t5nex.0.misc.tp_la: TP logic analyzer
dev.t5nex.0.misc.ulprx_la: ULPRX logic analyzer
Obtained from:Chelsio
MFC after:1 week
Modified:
head/sys/dev/cxgbe/t4_main.c
Modified: head/sys/dev/cxgbe/t4_main.c
==
--- head/sys/dev/cxgbe/t4_main.cSat Jun 1 01:02:24 2013
(r251212)
+++ head/sys/dev/cxgbe/t4_main.cSat Jun 1 02:07:37 2013
(r251213)
@@ -382,6 +382,8 @@ static int sysctl_handle_t4_reg64(SYSCTL
static int sysctl_cctrl(SYSCTL_HANDLER_ARGS);
static int sysctl_cim_ibq_obq(SYSCTL_HANDLER_ARGS);
static int sysctl_cim_la(SYSCTL_HANDLER_ARGS);
+static int sysctl_cim_ma_la(SYSCTL_HANDLER_ARGS);
+static int sysctl_cim_pif_la(SYSCTL_HANDLER_ARGS);
static int sysctl_cim_qcfg(SYSCTL_HANDLER_ARGS);
static int sysctl_cpl_stats(SYSCTL_HANDLER_ARGS);
static int sysctl_ddp_stats(SYSCTL_HANDLER_ARGS);
@@ -390,13 +392,16 @@ static int sysctl_fcoe_stats(SYSCTL_HAND
static int sysctl_hw_sched(SYSCTL_HANDLER_ARGS);
static int sysctl_lb_stats(SYSCTL_HANDLER_ARGS);
static int sysctl_meminfo(SYSCTL_HANDLER_ARGS);
+static int sysctl_mps_tcam(SYSCTL_HANDLER_ARGS);
static int sysctl_path_mtus(SYSCTL_HANDLER_ARGS);
static int sysctl_pm_stats(SYSCTL_HANDLER_ARGS);
static int sysctl_rdma_stats(SYSCTL_HANDLER_ARGS);
static int sysctl_tcp_stats(SYSCTL_HANDLER_ARGS);
static int sysctl_tids(SYSCTL_HANDLER_ARGS);
static int sysctl_tp_err_stats(SYSCTL_HANDLER_ARGS);
+static int sysctl_tp_la(SYSCTL_HANDLER_ARGS);
static int sysctl_tx_rate(SYSCTL_HANDLER_ARGS);
+static int sysctl_ulprx_la(SYSCTL_HANDLER_ARGS);
static int sysctl_wcwr_stats(SYSCTL_HANDLER_ARGS);
#endif
static inline void txq_start(struct ifnet *, struct sge_txq *);
@@ -4220,6 +4225,10 @@ t4_sysctls(struct adapter *sc)
CTLTYPE_STRING | CTLFLAG_RD, sc, 0,
sysctl_cim_la, "A", "CIM logic analyzer");
+ SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "cim_ma_la",
+ CTLTYPE_STRING | CTLFLAG_RD, sc, 0,
+ sysctl_cim_ma_la, "A", "CIM MA logic analyzer");
+
SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "cim_obq_ulp0",
CTLTYPE_STRING | CTLFLAG_RD, sc, 0 + CIM_NUM_IBQ,
sysctl_cim_ibq_obq, "A", "CIM OBQ 0 (ULP0)");
@@ -4254,6 +4263,10 @@ t4_sysctls(struct adapter *sc)
sysctl_cim_ibq_obq, "A", "CIM OBQ 7 (SGE1-RX)");
}
+ SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "cim_pif_la",
+ CTLTYPE_STRING | CTLFLAG_RD, sc, 0,
+ sysctl_cim_pif_la, "A", "CIM PIF logic analyzer");
+
SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "cim_qcfg",
CTLTYPE_STRING | CTLFLAG_RD, sc, 0,
sysctl_cim_qcfg, "A", "CIM queue configuration");
@@ -4290,6 +4303,10 @@ t4_sysctls(struct adapter *sc)
CTLTYPE_STRING | CTLFLAG_RD, sc, 0,
sysctl_meminfo, "A", "memory regions");
+ SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "mps_tcam",
+ CTLTYPE_STRING | CTLFLAG_RD, sc, 0,
+ sysctl_mps_tcam, "A", "MPS TCAM entries");
+
SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "path_mtus",
CTLTYPE_STRING | CTLFLAG_RD, sc, 0,
sysctl_path_mtus, "A", "path MTUs");
@@ -4314,10 +4331,18 @@ t4_sysctls(struct adapter *sc)
CTLTYPE_STRING | CTLFLAG_RD, sc, 0,
sysctl_tp_err_stats, "A", "TP error statistics");
+ SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "tp_la",
+ CTLTYPE_STRING | CTLFLAG_RD, sc, 0,
+ sysctl_tp_la, "A", "TP logic analyzer");
+
SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "tx_rate",
CTLTYPE_STRING | CTLFLAG_RD, sc, 0,
sysctl_tx_rate, "A", "Tx rate");
+ SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "ulprx_la",
+ CTLTYPE_STRING | CTLFLAG_RD, sc, 0,
+ sysctl_ulprx_la, "A", "ULPRX logic analyzer");
+
if (is_t5(sc)) {
SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "wcwr_stats",
CTLTYPE_STRING | CTLFLAG_RD, sc, 0,
@@ -4912,6 +4937,92 @@ done:
}
static int
+sysctl_cim_ma_la(SYSCTL_HANDLER_ARGS)
+{
+ struct adapter *sc = arg1;
+ u_int i;
+ struct sbuf *sb;
+ uint32_t *buf, *p;
+ int rc;
+
+ rc = sysctl_wire_old_buffer(req, 0);
+ if (rc != 0)
+ return (rc);
+
+ sb = sbuf_new_for_sysctl(NULL, NULL, 4096, req);
+ if (sb == NULL)
+ return (ENOMEM);
+
+ buf = malloc(2 * CIM_MALA_SIZE * 5 * sizeof(uint32_t), M_CXGBE,
+ M_ZERO | M_WAITOK);
+
+ t4_cim_read_ma_la(sc, buf, buf + 5 * C
svn commit: r251214 - head/sys/dev/xen/blkfront
Author: gibbs
Date: Sat Jun 1 04:02:51 2013
New Revision: 251214
URL: http://svnweb.freebsd.org/changeset/base/251214
Log:
sys/dev/xen/blkfront/blkfront.c:
Remove local, and incorrect, definition for the value of an invalid
grant reference.
Extract ring cleanup code into xbd_free_ring() function for
symetry with xbd_alloc_ring(). This process also eliminated
an initialized but unused variable.
Sponsored by: Spectra Logic Corporation
MFC after:1 week
Modified:
head/sys/dev/xen/blkfront/blkfront.c
Modified: head/sys/dev/xen/blkfront/blkfront.c
==
--- head/sys/dev/xen/blkfront/blkfront.cSat Jun 1 02:07:37 2013
(r251213)
+++ head/sys/dev/xen/blkfront/blkfront.cSat Jun 1 04:02:51 2013
(r251214)
@@ -87,8 +87,6 @@ static void xbd_startio(struct xbd_softc
#define XBD_SECTOR_SIZE512 /* XXX: assume for now */
#define XBD_SECTOR_SHFT9
-#define GRANT_INVALID_REF 0
-
/* Control whether runtime update of vbds is enabled. */
#define ENABLE_VBD_UPDATE 0
@@ -709,6 +707,24 @@ xbd_alloc_ring(struct xbd_softc *sc)
return (0);
}
+static void
+xbd_free_ring(struct xbd_softc *sc)
+{
+ int i;
+
+ if (sc->xbd_ring.sring == NULL)
+ return;
+
+ for (i = 0; i < sc->xbd_ring_pages; i++) {
+ if (sc->xbd_ring_ref[i] != GRANT_REF_INVALID) {
+ gnttab_end_foreign_access_ref(sc->xbd_ring_ref[i]);
+ sc->xbd_ring_ref[i] = GRANT_REF_INVALID;
+ }
+ }
+ free(sc->xbd_ring.sring, M_XENBLOCKFRONT);
+ sc->xbd_ring.sring = NULL;
+}
+
/*-- Initialization/Teardown
-*/
static void
xbd_setup_sysctl(struct xbd_softc *xbd)
@@ -846,7 +862,6 @@ xbd_instance_create(struct xbd_softc *sc
static void
xbd_free(struct xbd_softc *sc)
{
- uint8_t *sring_page_ptr;
int i;
/* Prevent new requests being issued until we fix things up. */
@@ -855,22 +870,7 @@ xbd_free(struct xbd_softc *sc)
mtx_unlock(&sc->xbd_io_lock);
/* Free resources associated with old device channel. */
- if (sc->xbd_ring.sring != NULL) {
- sring_page_ptr = (uint8_t *)sc->xbd_ring.sring;
- for (i = 0; i < sc->xbd_ring_pages; i++) {
- grant_ref_t *ref;
-
- ref = &sc->xbd_ring_ref[i];
- if (*ref != GRANT_INVALID_REF) {
- gnttab_end_foreign_access_ref(*ref);
- *ref = GRANT_INVALID_REF;
- }
- sring_page_ptr += PAGE_SIZE;
- }
- free(sc->xbd_ring.sring, M_XENBLOCKFRONT);
- sc->xbd_ring.sring = NULL;
- }
-
+ xbd_free_ring(sc);
if (sc->xbd_shadow) {
for (i = 0; i < sc->xbd_max_requests; i++) {
@@ -1277,7 +1277,7 @@ xbd_attach(device_t dev)
xbd_initq_complete(sc);
xbd_initq_bio(sc);
for (i = 0; i < XBD_MAX_RING_PAGES; i++)
- sc->xbd_ring_ref[i] = GRANT_INVALID_REF;
+ sc->xbd_ring_ref[i] = GRANT_REF_INVALID;
sc->xbd_dev = dev;
sc->xbd_vdevice = vdevice;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r251215 - head/sys/dev/xen/blkfront
Author: gibbs Date: Sat Jun 1 04:07:56 2013 New Revision: 251215 URL: http://svnweb.freebsd.org/changeset/base/251215 Log: sys/dev/xen/blkfront/blkfront.c: Remove dead code. Sponsored by: Spectra Logic Corporation MFC after:1 week Modified: head/sys/dev/xen/blkfront/blkfront.c Modified: head/sys/dev/xen/blkfront/blkfront.c == --- head/sys/dev/xen/blkfront/blkfront.cSat Jun 1 04:02:51 2013 (r251214) +++ head/sys/dev/xen/blkfront/blkfront.cSat Jun 1 04:07:56 2013 (r251215) @@ -81,19 +81,8 @@ static void xbd_startio(struct xbd_softc #define DPRINTK(fmt, args...) #endif -/* XXX move to xbd_vbd.c when VBD update support is added */ -#define MAX_VBDS 64 - -#define XBD_SECTOR_SIZE512 /* XXX: assume for now */ #define XBD_SECTOR_SHFT9 -/* Control whether runtime update of vbds is enabled. */ -#define ENABLE_VBD_UPDATE 0 - -#if ENABLE_VBD_UPDATE -static void vbd_update(void); -#endif - #define XBD_STATE_DISCONNECTED 0 #define XBD_STATE_CONNECTED1 #define XBD_STATE_SUSPENDED2 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
