Date: Wed, 19 Nov 2014 16:23:57 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274717 - in projects/sendfile: sbin/ifconfig sys/cam/ctl sys/cddl/contrib/opensolaris/uts/common/sys sys/contrib/ngatm/netnatm/saal sys/dev/beri/virtio sys/dev/isp sys/dev/pci sys/kern... Message-ID: <201411191623.sAJGNvrd076181@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Wed Nov 19 16:23:57 2014 New Revision: 274717 URL: https://svnweb.freebsd.org/changeset/base/274717 Log: Merge head. Added: projects/sendfile/sys/dev/beri/virtio/ - copied from r274716, head/sys/dev/beri/virtio/ Modified: projects/sendfile/sbin/ifconfig/ifgroup.c projects/sendfile/sys/cam/ctl/ctl_frontend_iscsi.c projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h projects/sendfile/sys/contrib/ngatm/netnatm/saal/saal_sscop.c projects/sendfile/sys/dev/isp/isp_freebsd.c projects/sendfile/sys/dev/isp/isp_freebsd.h projects/sendfile/sys/dev/pci/pci.c projects/sendfile/sys/kern/kern_cons.c projects/sendfile/sys/kern/uipc_socket.c projects/sendfile/sys/netpfil/pf/pf_ioctl.c projects/sendfile/sys/vm/vnode_pager.c Directory Properties: projects/sendfile/ (props changed) projects/sendfile/sbin/ (props changed) projects/sendfile/sys/ (props changed) projects/sendfile/sys/cddl/contrib/opensolaris/ (props changed) Modified: projects/sendfile/sbin/ifconfig/ifgroup.c ============================================================================== --- projects/sendfile/sbin/ifconfig/ifgroup.c Wed Nov 19 16:18:54 2014 (r274716) +++ projects/sendfile/sbin/ifconfig/ifgroup.c Wed Nov 19 16:23:57 2014 (r274717) @@ -86,9 +86,6 @@ getifgroups(int s) struct ifgroupreq ifgr; struct ifg_req *ifg; - if (!verbose) - return; - memset(&ifgr, 0, sizeof(ifgr)); strlcpy(ifgr.ifgr_name, name, IFNAMSIZ); @@ -121,6 +118,8 @@ getifgroups(int s) } if (cnt) printf("\n"); + + free(ifgr.ifgr_groups); } static void Modified: projects/sendfile/sys/cam/ctl/ctl_frontend_iscsi.c ============================================================================== --- projects/sendfile/sys/cam/ctl/ctl_frontend_iscsi.c Wed Nov 19 16:18:54 2014 (r274716) +++ projects/sendfile/sys/cam/ctl/ctl_frontend_iscsi.c Wed Nov 19 16:23:57 2014 (r274717) @@ -1982,7 +1982,7 @@ cfiscsi_ioctl_port_create(struct ctl_req if (ct->ct_state == CFISCSI_TARGET_STATE_ACTIVE) { req->status = CTL_LUN_ERROR; snprintf(req->error_str, sizeof(req->error_str), - "target \"%s\" already exist", target); + "target \"%s\" already exists", target); cfiscsi_target_release(ct); ctl_free_opts(&opts); return; Modified: projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h ============================================================================== --- projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h Wed Nov 19 16:18:54 2014 (r274716) +++ projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h Wed Nov 19 16:23:57 2014 (r274717) @@ -331,7 +331,9 @@ extern "C" { /* * Define the appropriate "implementation choices". */ +#if !defined(_ILP32) #define _ILP32 +#endif #if !defined(_I32LPx) && defined(_KERNEL) #define _I32LPx #endif Modified: projects/sendfile/sys/contrib/ngatm/netnatm/saal/saal_sscop.c ============================================================================== --- projects/sendfile/sys/contrib/ngatm/netnatm/saal/saal_sscop.c Wed Nov 19 16:18:54 2014 (r274716) +++ projects/sendfile/sys/contrib/ngatm/netnatm/saal/saal_sscop.c Wed Nov 19 16:23:57 2014 (r274717) @@ -163,18 +163,17 @@ static void sscop_set_state(struct sscop } \ } while(0) - -#define QFIND(Q,RN) \ - ({ \ - struct sscop_msg *_msg = NULL, *_m; \ - MSGQ_FOREACH(_m, (Q)) { \ - if(_m->seqno == (RN)) { \ - _msg = _m; \ - break; \ - } \ - } \ - _msg; \ - }) +static inline struct sscop_msg *QFIND(sscop_msgq_head_t *q, u_int rn) +{ + struct sscop_msg *msg = NULL, *m; + MSGQ_FOREACH(m, q) { + if(m->seqno == rn) { + msg = m; + break; + } + } + return msg; +} #define QINSERT(Q,M) \ do { \ Modified: projects/sendfile/sys/dev/isp/isp_freebsd.c ============================================================================== --- projects/sendfile/sys/dev/isp/isp_freebsd.c Wed Nov 19 16:18:54 2014 (r274716) +++ projects/sendfile/sys/dev/isp/isp_freebsd.c Wed Nov 19 16:23:57 2014 (r274717) @@ -2136,9 +2136,8 @@ static void isp_refire_putback_atio(void *arg) { union ccb *ccb = arg; - ispsoftc_t *isp = XS_ISP(ccb); - ISP_ASSERT_LOCKED(isp); + ISP_ASSERT_LOCKED((ispsoftc_t *)XS_ISP(ccb)); isp_target_putback_atio(ccb); } Modified: projects/sendfile/sys/dev/isp/isp_freebsd.h ============================================================================== --- projects/sendfile/sys/dev/isp/isp_freebsd.h Wed Nov 19 16:18:54 2014 (r274716) +++ projects/sendfile/sys/dev/isp/isp_freebsd.h Wed Nov 19 16:23:57 2014 (r274717) @@ -400,9 +400,9 @@ struct isposinfo { /* * Locking macros... */ -#define ISP_LOCK(isp) mtx_lock(&isp->isp_osinfo.lock) -#define ISP_UNLOCK(isp) mtx_unlock(&isp->isp_osinfo.lock) -#define ISP_ASSERT_LOCKED(isp) mtx_assert(&isp->isp_osinfo.lock, MA_OWNED) +#define ISP_LOCK(isp) mtx_lock(&(isp)->isp_osinfo.lock) +#define ISP_UNLOCK(isp) mtx_unlock(&(isp)->isp_osinfo.lock) +#define ISP_ASSERT_LOCKED(isp) mtx_assert(&(isp)->isp_osinfo.lock, MA_OWNED) /* * Required Macros/Defines Modified: projects/sendfile/sys/dev/pci/pci.c ============================================================================== --- projects/sendfile/sys/dev/pci/pci.c Wed Nov 19 16:18:54 2014 (r274716) +++ projects/sendfile/sys/dev/pci/pci.c Wed Nov 19 16:23:57 2014 (r274717) @@ -3637,6 +3637,7 @@ static void pci_set_power_child(device_t dev, device_t child, int state) { struct pci_devinfo *dinfo; + device_t pcib; int dstate; /* @@ -3646,10 +3647,11 @@ pci_set_power_child(device_t dev, device * device power. Skip children who aren't attached since they * are handled separately. */ + pcib = device_get_parent(dev); dinfo = device_get_ivars(child); dstate = state; if (device_is_attached(child) && - PCIB_POWER_FOR_SLEEP(dev, child, &dstate) == 0) + PCIB_POWER_FOR_SLEEP(pcib, child, &dstate) == 0) pci_set_powerstate(child, dstate); } Modified: projects/sendfile/sys/kern/kern_cons.c ============================================================================== --- projects/sendfile/sys/kern/kern_cons.c Wed Nov 19 16:18:54 2014 (r274716) +++ projects/sendfile/sys/kern/kern_cons.c Wed Nov 19 16:23:57 2014 (r274717) @@ -156,6 +156,13 @@ cninit(void) * Make the best console the preferred console. */ cnselect(best_cn); + +#ifdef EARLY_PRINTF + /* + * Release early console. + */ + early_putc = NULL; +#endif } void Modified: projects/sendfile/sys/kern/uipc_socket.c ============================================================================== --- projects/sendfile/sys/kern/uipc_socket.c Wed Nov 19 16:18:54 2014 (r274716) +++ projects/sendfile/sys/kern/uipc_socket.c Wed Nov 19 16:23:57 2014 (r274717) @@ -1310,7 +1310,7 @@ restart: resid = 0; if (flags & MSG_EOR) top->m_flags |= M_EOR; - } else { + } else if (resid > 0) { /* * Copy the data from userland into a mbuf * chain. If no data is to be copied in, Modified: projects/sendfile/sys/netpfil/pf/pf_ioctl.c ============================================================================== --- projects/sendfile/sys/netpfil/pf/pf_ioctl.c Wed Nov 19 16:18:54 2014 (r274716) +++ projects/sendfile/sys/netpfil/pf/pf_ioctl.c Wed Nov 19 16:23:57 2014 (r274717) @@ -76,6 +76,7 @@ __FBSDID("$FreeBSD$"); #include <netinet/in.h> #include <netinet/ip.h> #include <netinet/ip_var.h> +#include <netinet6/ip6_var.h> #include <netinet/ip_icmp.h> #ifdef INET6 @@ -3619,12 +3620,11 @@ pf_check6_out(void *arg, struct mbuf **m int chk; /* We need a proper CSUM before we start (s. OpenBSD ip_output) */ - if ((*m)->m_pkthdr.csum_flags & CSUM_DELAY_DATA) { -#ifdef INET - /* XXX-BZ copy&paste error from r126261? */ - in_delayed_cksum(*m); -#endif - (*m)->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA; + if ((*m)->m_pkthdr.csum_flags & CSUM_DELAY_DATA_IPV6) { + in6_delayed_cksum(*m, + (*m)->m_pkthdr.len - sizeof(struct ip6_hdr), + sizeof(struct ip6_hdr)); + (*m)->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA_IPV6; } CURVNET_SET(ifp->if_vnet); chk = pf_test6(PF_OUT, ifp, m, inp); Modified: projects/sendfile/sys/vm/vnode_pager.c ============================================================================== --- projects/sendfile/sys/vm/vnode_pager.c Wed Nov 19 16:18:54 2014 (r274716) +++ projects/sendfile/sys/vm/vnode_pager.c Wed Nov 19 16:23:57 2014 (r274717) @@ -957,7 +957,7 @@ vnode_pager_generic_getpages(struct vnod * and map the pages to be read into the kva, if the filesystem * requires mapped buffers. */ - if ((vp->v_mount->mnt_kern_flag & MNTK_UNMAPPED_BUFS) && + if ((vp->v_mount->mnt_kern_flag & MNTK_UNMAPPED_BUFS) != 0 && unmapped_buf_allowed) { bp->b_data = unmapped_buf; bp->b_kvabase = unmapped_buf;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411191623.sAJGNvrd076181>