From owner-svn-src-stable-9@FreeBSD.ORG Sun Sep 23 06:16:09 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 09E871065672; Sun, 23 Sep 2012 06:16:09 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E8EAF8FC0C; Sun, 23 Sep 2012 06:16:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8N6G8PQ033716; Sun, 23 Sep 2012 06:16:08 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8N6G8Pi033714; Sun, 23 Sep 2012 06:16:08 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201209230616.q8N6G8Pi033714@svn.freebsd.org> From: Konstantin Belousov Date: Sun, 23 Sep 2012 06:16:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240847 - stable/9/usr.bin/procstat X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Sep 2012 06:16:09 -0000 Author: kib Date: Sun Sep 23 06:16:08 2012 New Revision: 240847 URL: http://svn.freebsd.org/changeset/base/240847 Log: MFC r240546: Handle AT_TIMEKEEP in procstat(1) -x. PR: bin/171662 Modified: stable/9/usr.bin/procstat/procstat_auxv.c Directory Properties: stable/9/usr.bin/procstat/ (props changed) Modified: stable/9/usr.bin/procstat/procstat_auxv.c ============================================================================== --- stable/9/usr.bin/procstat/procstat_auxv.c Sun Sep 23 03:46:03 2012 (r240846) +++ stable/9/usr.bin/procstat/procstat_auxv.c Sun Sep 23 06:16:08 2012 (r240847) @@ -231,9 +231,11 @@ procstat_auxv(struct kinfo_proc *kipp) else PRINT(AT_STACKPROT, %s, "EXECUTABLE"); break; - case AT_COUNT: - PRINT(AT_COUNT, %ld, (long)auxv[i].a_un.a_val); +#ifdef AT_TIMEKEEP + case AT_TIMEKEEP: + PRINT(AT_TIMEKEEP, %p, auxv[i].a_un.a_ptr); break; +#endif default: PRINT_UNKNOWN(auxv[i].a_type, auxv[i].a_un.a_val); break; From owner-svn-src-stable-9@FreeBSD.ORG Sun Sep 23 14:49:29 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 615A0106564A; Sun, 23 Sep 2012 14:49:29 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4B7A78FC14; Sun, 23 Sep 2012 14:49:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8NEnTda020523; Sun, 23 Sep 2012 14:49:29 GMT (envelope-from zeising@svn.freebsd.org) Received: (from zeising@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8NEnTeI020521; Sun, 23 Sep 2012 14:49:29 GMT (envelope-from zeising@svn.freebsd.org) Message-Id: <201209231449.q8NEnTeI020521@svn.freebsd.org> From: Niclas Zeising Date: Sun, 23 Sep 2012 14:49:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240858 - stable/9/share/man/man4 X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Sep 2012 14:49:29 -0000 Author: zeising (doc,ports committer) Date: Sun Sep 23 14:49:28 2012 New Revision: 240858 URL: http://svn.freebsd.org/changeset/base/240858 Log: MFC r240205: Change the link pointing to more information about the Yarrow algorithm, the current link points to a irrelevant catchall site. PR: docs/171411 Submitted by: Mark Martinec (pr), zeising (patch) Approved by: joel (mentor) Modified: stable/9/share/man/man4/random.4 Directory Properties: stable/9/share/man/man4/ (props changed) Modified: stable/9/share/man/man4/random.4 ============================================================================== --- stable/9/share/man/man4/random.4 Sun Sep 23 12:19:19 2012 (r240857) +++ stable/9/share/man/man4/random.4 Sun Sep 23 14:49:28 2012 (r240858) @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 19, 2006 +.Dd September 7, 2012 .Dt RANDOM 4 .Os .Sh NAME @@ -142,7 +142,7 @@ if you wish to use them for entropy harv The other variables are explained in the paper describing the .Em Yarrow algorithm at -.Pa http://www.counterpane.com/yarrow.html . +.Pa http://www.schneier.com/yarrow.html . .Pp These variables are all limited in terms of the values they may contain: From owner-svn-src-stable-9@FreeBSD.ORG Sun Sep 23 19:14:14 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B18011065673; Sun, 23 Sep 2012 19:14:14 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9D60D8FC12; Sun, 23 Sep 2012 19:14:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8NJEEiX058668; Sun, 23 Sep 2012 19:14:14 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8NJEE2c058666; Sun, 23 Sep 2012 19:14:14 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <201209231914.q8NJEE2c058666@svn.freebsd.org> From: Sean Bruno Date: Sun, 23 Sep 2012 19:14:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240867 - stable/9/sys/dev/mfi X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Sep 2012 19:14:14 -0000 Author: sbruno Date: Sun Sep 23 19:14:13 2012 New Revision: 240867 URL: http://svn.freebsd.org/changeset/base/240867 Log: MFC r238373 sys/dev/mfivar.h contains references to MFI_DEBUG, but it never gets turned on unless the file also includes opt_mfi.h. Submitted by: Andrew Boyer aboyer@averesystems.com Modified: stable/9/sys/dev/mfi/mfivar.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/mfi/mfivar.h ============================================================================== --- stable/9/sys/dev/mfi/mfivar.h Sun Sep 23 18:32:03 2012 (r240866) +++ stable/9/sys/dev/mfi/mfivar.h Sun Sep 23 19:14:13 2012 (r240867) @@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include "opt_mfi.h" /* * SCSI structures and definitions are used from here, but no linking From owner-svn-src-stable-9@FreeBSD.ORG Sun Sep 23 20:17:29 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 702431065673; Sun, 23 Sep 2012 20:17:29 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5B6D28FC1C; Sun, 23 Sep 2012 20:17:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8NKHTn9068454; Sun, 23 Sep 2012 20:17:29 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8NKHTZa068452; Sun, 23 Sep 2012 20:17:29 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <201209232017.q8NKHTZa068452@svn.freebsd.org> From: Sean Bruno Date: Sun, 23 Sep 2012 20:17:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240873 - stable/9/sys/dev/mfi X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Sep 2012 20:17:29 -0000 Author: sbruno Date: Sun Sep 23 20:17:28 2012 New Revision: 240873 URL: http://svn.freebsd.org/changeset/base/240873 Log: MFC r238371 When an MFI command fails, the driver needs to set bio->bio_resid so that the upper levels notice. Otherwise we see commands silently failing leading to data corruption. This mirrors dadone() Submitted by: Andrew Boyer aboyer@averesystems.com Modified: stable/9/sys/dev/mfi/mfi_disk.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/mfi/mfi_disk.c ============================================================================== --- stable/9/sys/dev/mfi/mfi_disk.c Sun Sep 23 20:16:45 2012 (r240872) +++ stable/9/sys/dev/mfi/mfi_disk.c Sun Sep 23 20:17:28 2012 (r240873) @@ -298,6 +298,7 @@ mfi_disk_complete(struct bio *bio) hdr = bio->bio_driver1; if (bio->bio_flags & BIO_ERROR) { + bio->bio_resid = bio->bio_bcount; if (bio->bio_error == 0) bio->bio_error = EIO; disk_err(bio, "hard error", -1, 1); From owner-svn-src-stable-9@FreeBSD.ORG Sun Sep 23 20:28:47 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A55AD106566B; Sun, 23 Sep 2012 20:28:47 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 900EF8FC12; Sun, 23 Sep 2012 20:28:47 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8NKSlAq070485; Sun, 23 Sep 2012 20:28:47 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8NKSlh2070483; Sun, 23 Sep 2012 20:28:47 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <201209232028.q8NKSlh2070483@svn.freebsd.org> From: Sean Bruno Date: Sun, 23 Sep 2012 20:28:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240876 - stable/9/sys/dev/aac X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Sep 2012 20:28:47 -0000 Author: sbruno Date: Sun Sep 23 20:28:47 2012 New Revision: 240876 URL: http://svn.freebsd.org/changeset/base/240876 Log: MFC r238601 On BIO_ERROR, set bio_resid to stop losing data in the error case. Submitted by: Mark Johnston Modified: stable/9/sys/dev/aac/aac_disk.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/aac/aac_disk.c ============================================================================== --- stable/9/sys/dev/aac/aac_disk.c Sun Sep 23 20:24:24 2012 (r240875) +++ stable/9/sys/dev/aac/aac_disk.c Sun Sep 23 20:28:47 2012 (r240876) @@ -334,8 +334,10 @@ aac_biodone(struct bio *bp) { fwprintf(NULL, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - if (bp->bio_flags & BIO_ERROR) + if (bp->bio_flags & BIO_ERROR) { + bp->bio_resid = bp->bio_bcount; disk_err(bp, "hard error", -1, 1); + } biodone(bp); } From owner-svn-src-stable-9@FreeBSD.ORG Mon Sep 24 20:00:31 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DD93C106566C; Mon, 24 Sep 2012 20:00:31 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C7E878FC16; Mon, 24 Sep 2012 20:00:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8OK0VjG087849; Mon, 24 Sep 2012 20:00:31 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8OK0Vfi087846; Mon, 24 Sep 2012 20:00:31 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201209242000.q8OK0Vfi087846@svn.freebsd.org> From: Dimitry Andric Date: Mon, 24 Sep 2012 20:00:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240896 - stable/9/sys/conf X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Sep 2012 20:00:32 -0000 Author: dim Date: Mon Sep 24 20:00:31 2012 New Revision: 240896 URL: http://svn.freebsd.org/changeset/base/240896 Log: MFC r240144: After r240104, make sure the hpt27xx driver also compiles with clang, when it is statically linked into the kernel. Modified: stable/9/sys/conf/files.amd64 stable/9/sys/conf/files.i386 Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/conf/files.amd64 ============================================================================== --- stable/9/sys/conf/files.amd64 Mon Sep 24 19:48:41 2012 (r240895) +++ stable/9/sys/conf/files.amd64 Mon Sep 24 20:00:31 2012 (r240896) @@ -192,7 +192,8 @@ dev/fdc/fdc_acpi.c optional fdc dev/fdc/fdc_isa.c optional fdc isa dev/fdc/fdc_pccard.c optional fdc pccard dev/hpt27xx/os_bsd.c optional hpt27xx -dev/hpt27xx/osm_bsd.c optional hpt27xx +dev/hpt27xx/osm_bsd.c optional hpt27xx \ + compile-with "${NORMAL_C} ${NO_WFORMAT_SECURITY}" dev/hpt27xx/hpt27xx_config.c optional hpt27xx dev/hptmv/entry.c optional hptmv dev/hptmv/mv.c optional hptmv Modified: stable/9/sys/conf/files.i386 ============================================================================== --- stable/9/sys/conf/files.i386 Mon Sep 24 19:48:41 2012 (r240895) +++ stable/9/sys/conf/files.i386 Mon Sep 24 20:00:31 2012 (r240896) @@ -180,7 +180,8 @@ dev/glxiic/glxiic.c optional glxiic dev/glxsb/glxsb.c optional glxsb dev/glxsb/glxsb_hash.c optional glxsb dev/hpt27xx/os_bsd.c optional hpt27xx -dev/hpt27xx/osm_bsd.c optional hpt27xx +dev/hpt27xx/osm_bsd.c optional hpt27xx \ + compile-with "${NORMAL_C} ${NO_WFORMAT_SECURITY}" dev/hpt27xx/hpt27xx_config.c optional hpt27xx dev/hptmv/entry.c optional hptmv dev/hptmv/mv.c optional hptmv From owner-svn-src-stable-9@FreeBSD.ORG Mon Sep 24 20:03:13 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C3FB7106566B; Mon, 24 Sep 2012 20:03:13 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AE8258FC0C; Mon, 24 Sep 2012 20:03:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8OK3DGp088319; Mon, 24 Sep 2012 20:03:13 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8OK3Dfj088317; Mon, 24 Sep 2012 20:03:13 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201209242003.q8OK3Dfj088317@svn.freebsd.org> From: Dimitry Andric Date: Mon, 24 Sep 2012 20:03:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240897 - stable/9/contrib/llvm/lib/Target/X86 X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Sep 2012 20:03:13 -0000 Author: dim Date: Mon Sep 24 20:03:13 2012 New Revision: 240897 URL: http://svn.freebsd.org/changeset/base/240897 Log: MFC r240531: Pull in r163967 from upstream llvm trunk: X86: Emitting x87 fsin/fcos for sinf/cosf is not safe without unsafe fp math. This should make clang emit calls to libm for sinf/cosf by default. Modified: stable/9/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp Directory Properties: stable/9/contrib/llvm/ (props changed) Modified: stable/9/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp ============================================================================== --- stable/9/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp Mon Sep 24 20:00:31 2012 (r240896) +++ stable/9/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp Mon Sep 24 20:03:13 2012 (r240897) @@ -641,7 +641,9 @@ X86TargetLowering::X86TargetLowering(X86 setOperationAction(ISD::FCOPYSIGN, MVT::f32, Expand); if (!TM.Options.UnsafeFPMath) { + setOperationAction(ISD::FSIN , MVT::f32 , Expand); setOperationAction(ISD::FSIN , MVT::f64 , Expand); + setOperationAction(ISD::FCOS , MVT::f32 , Expand); setOperationAction(ISD::FCOS , MVT::f64 , Expand); } addLegalFPImmediate(APFloat(+0.0)); // FLD0 From owner-svn-src-stable-9@FreeBSD.ORG Mon Sep 24 20:05:52 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 96581106566B; Mon, 24 Sep 2012 20:05:52 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8192A8FC0C; Mon, 24 Sep 2012 20:05:52 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8OK5q1q088775; Mon, 24 Sep 2012 20:05:52 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8OK5qdv088772; Mon, 24 Sep 2012 20:05:52 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201209242005.q8OK5qdv088772@svn.freebsd.org> From: Dimitry Andric Date: Mon, 24 Sep 2012 20:05:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240898 - in stable/9/sys: amd64/amd64 i386/i386 X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Sep 2012 20:05:52 -0000 Author: dim Date: Mon Sep 24 20:05:52 2012 New Revision: 240898 URL: http://svn.freebsd.org/changeset/base/240898 Log: MFC r240773: After r205013, amd64 and i386 CPU family and model IDs were printed out in hexadecimal, but without any 0x prefix, which can be very misleading. Modified: stable/9/sys/amd64/amd64/identcpu.c stable/9/sys/i386/i386/identcpu.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/amd64/amd64/identcpu.c ============================================================================== --- stable/9/sys/amd64/amd64/identcpu.c Mon Sep 24 20:03:13 2012 (r240897) +++ stable/9/sys/amd64/amd64/identcpu.c Mon Sep 24 20:05:52 2012 (r240898) @@ -213,8 +213,8 @@ printcpuinfo(void) if (cpu_vendor_id == CPU_VENDOR_INTEL || cpu_vendor_id == CPU_VENDOR_AMD || cpu_vendor_id == CPU_VENDOR_CENTAUR) { - printf(" Family = %x", CPUID_TO_FAMILY(cpu_id)); - printf(" Model = %x", CPUID_TO_MODEL(cpu_id)); + printf(" Family = 0x%x", CPUID_TO_FAMILY(cpu_id)); + printf(" Model = 0x%x", CPUID_TO_MODEL(cpu_id)); printf(" Stepping = %u", cpu_id & CPUID_STEPPING); /* Modified: stable/9/sys/i386/i386/identcpu.c ============================================================================== --- stable/9/sys/i386/i386/identcpu.c Mon Sep 24 20:03:13 2012 (r240897) +++ stable/9/sys/i386/i386/identcpu.c Mon Sep 24 20:05:52 2012 (r240898) @@ -688,8 +688,8 @@ printcpuinfo(void) cpu_vendor_id == CPU_VENDOR_NSC || (cpu_vendor_id == CPU_VENDOR_CYRIX && ((cpu_id & 0xf00) > 0x500))) { - printf(" Family = %x", CPUID_TO_FAMILY(cpu_id)); - printf(" Model = %x", CPUID_TO_MODEL(cpu_id)); + printf(" Family = 0x%x", CPUID_TO_FAMILY(cpu_id)); + printf(" Model = 0x%x", CPUID_TO_MODEL(cpu_id)); printf(" Stepping = %u", cpu_id & CPUID_STEPPING); if (cpu_vendor_id == CPU_VENDOR_CYRIX) printf("\n DIR=0x%04x", cyrix_did); From owner-svn-src-stable-9@FreeBSD.ORG Tue Sep 25 01:28:15 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2A3BA1065670; Tue, 25 Sep 2012 01:28:15 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 15B3D8FC12; Tue, 25 Sep 2012 01:28:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8P1SEeg036225; Tue, 25 Sep 2012 01:28:14 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8P1SECL036222; Tue, 25 Sep 2012 01:28:14 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201209250128.q8P1SECL036222@svn.freebsd.org> From: Eitan Adler Date: Tue, 25 Sep 2012 01:28:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240904 - stable/9/sys/dev/ixgbe X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Sep 2012 01:28:15 -0000 Author: eadler Date: Tue Sep 25 01:28:14 2012 New Revision: 240904 URL: http://svn.freebsd.org/changeset/base/240904 Log: MFC r240466: Define missing DEBUGOUT# macros. DEBUGOUT[45] are not yet used but are being defined pre-emptively to avoid future build breakage PR: kern/168967 Approved by: cperciva (implicit) Modified: stable/9/sys/dev/ixgbe/ixgbe_osdep.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) stable/9/sys/dev/ixgbe/ (props changed) Modified: stable/9/sys/dev/ixgbe/ixgbe_osdep.h ============================================================================== --- stable/9/sys/dev/ixgbe/ixgbe_osdep.h Tue Sep 25 01:28:13 2012 (r240903) +++ stable/9/sys/dev/ixgbe/ixgbe_osdep.h Tue Sep 25 01:28:14 2012 (r240904) @@ -69,12 +69,17 @@ #define DEBUGOUT1(S,A) printf(S "\n",A) #define DEBUGOUT2(S,A,B) printf(S "\n",A,B) #define DEBUGOUT3(S,A,B,C) printf(S "\n",A,B,C) + #define DEBUGOUT4(S,A,B,C,D) printf(S "\n",A,B,C,D) + #define DEBUGOUT5(S,A,B,C,D,E) printf(S "\n",A,B,C,D,E) + #define DEBUGOUT6(S,A,B,C,D,E,F) printf(S "\n",A,B,C,D,E,F) #define DEBUGOUT7(S,A,B,C,D,E,F,G) printf(S "\n",A,B,C,D,E,F,G) #else #define DEBUGOUT(S) #define DEBUGOUT1(S,A) #define DEBUGOUT2(S,A,B) #define DEBUGOUT3(S,A,B,C) + #define DEBUGOUT4(S,A,B,C,D) + #define DEBUGOUT5(S,A,B,C,D,E) #define DEBUGOUT6(S,A,B,C,D,E,F) #define DEBUGOUT7(S,A,B,C,D,E,F,G) #endif From owner-svn-src-stable-9@FreeBSD.ORG Tue Sep 25 01:31:25 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5E4281065674; Tue, 25 Sep 2012 01:31:25 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2CCDD8FC0C; Tue, 25 Sep 2012 01:31:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8P1VP2Z036754; Tue, 25 Sep 2012 01:31:25 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8P1VOAg036751; Tue, 25 Sep 2012 01:31:24 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201209250131.q8P1VOAg036751@svn.freebsd.org> From: Eitan Adler Date: Tue, 25 Sep 2012 01:31:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240907 - in stable/9/tools: diag diag/ac tools tools/backout_commit tools/mfc X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Sep 2012 01:31:25 -0000 Author: eadler Date: Tue Sep 25 01:31:24 2012 New Revision: 240907 URL: http://svn.freebsd.org/changeset/base/240907 Log: MFC r240470: Remove scripts and tools which only functioned when src was using CVS Approved by: cperciva (implicit) Deleted: stable/9/tools/diag/ac/ stable/9/tools/tools/backout_commit/ stable/9/tools/tools/mfc/ Modified: stable/9/tools/diag/README stable/9/tools/tools/README Directory Properties: stable/9/tools/diag/ (props changed) stable/9/tools/tools/ (props changed) Modified: stable/9/tools/diag/README ============================================================================== --- stable/9/tools/diag/README Tue Sep 25 01:31:23 2012 (r240906) +++ stable/9/tools/diag/README Tue Sep 25 01:31:24 2012 (r240907) @@ -8,8 +8,6 @@ the integrity. Please make a subdir per program, and add a brief description to this file. -ac Various scripts that checks of style/content correctness of - committers lists in doc/ area. dumpvfscache program that can be used to examine the contents of the vfs name cache. httpd-error check for Web files which does not exists on your host Modified: stable/9/tools/tools/README ============================================================================== --- stable/9/tools/tools/README Tue Sep 25 01:31:23 2012 (r240906) +++ stable/9/tools/tools/README Tue Sep 25 01:31:24 2012 (r240907) @@ -10,8 +10,6 @@ file. ansify Convert K&R-style function definitions to ANSI style ath Tools specific to the Atheros 802.11 support -backout_commit A tool for reading in a commit message and generating - a script that will backout the commit. cfi Common Flash Interface (CFI) tool commitsdb A tool for reconstructing commit history using md5 checksums of the commit logs. @@ -45,8 +43,6 @@ kerninclude Shellscript to find unused # kernxref Shellscript to cross reference symbols in the LINT kernel. kttcp An in-kernel version of the ttcp network performance tool mctest A multicast test program -mfc Merge a directory from HEAD to a branch where it does not - already exist and other MFC related script(s). mid Create a Message-ID database for mailing lists. mwl Tools specific to the Marvell 88W8363 support ncpus Count the number of processors From owner-svn-src-stable-9@FreeBSD.ORG Tue Sep 25 01:33:23 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 19BA61065670; Tue, 25 Sep 2012 01:33:23 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 025748FC0A; Tue, 25 Sep 2012 01:33:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8P1XM9Z037125; Tue, 25 Sep 2012 01:33:22 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8P1XM8R037114; Tue, 25 Sep 2012 01:33:22 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201209250133.q8P1XM8R037114@svn.freebsd.org> From: Eitan Adler Date: Tue, 25 Sep 2012 01:33:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240909 - stable/9/share/misc X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Sep 2012 01:33:23 -0000 Author: eadler Date: Tue Sep 25 01:33:22 2012 New Revision: 240909 URL: http://svn.freebsd.org/changeset/base/240909 Log: MFC r240480: Belatedly add myself Approved by: cperciva (implicit) Modified: stable/9/share/misc/committers-src.dot Directory Properties: stable/9/share/misc/ (props changed) Modified: stable/9/share/misc/committers-src.dot ============================================================================== --- stable/9/share/misc/committers-src.dot Tue Sep 25 01:31:30 2012 (r240908) +++ stable/9/share/misc/committers-src.dot Tue Sep 25 01:33:22 2012 (r240909) @@ -131,6 +131,7 @@ dg [label="David Greenman\ndg@FreeBSD.or dim [label="Dimitry Andric\ndim@FreeBSD.org\n2010/08/30"] dougb [label="Doug Barton\ndougb@FreeBSD.org\n2000/10/26"] dwmalone [label="David Malone\ndwmalone@FreeBSD.org\n2000/07/11"] +eadler [label="Eitan Adler\neadler@FreeBSD.org\n2012/01/18"] ed [label="Ed Schouten\ned@FreeBSD.org\n2008/05/22"] edwin [label="Edwin Groothuis\nedwin@FreeBSD.org\n2007/06/25"] eivind [label="Eivind Eklund\neivind@FreeBSD.org\n????/??/??"] @@ -307,6 +308,7 @@ bz -> syrinx cognet -> kevlo +cperciva -> eadler cperciva -> flz cperciva -> randi cperciva -> simon From owner-svn-src-stable-9@FreeBSD.ORG Tue Sep 25 13:32:06 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 06396106564A; Tue, 25 Sep 2012 13:32:06 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E484D8FC0A; Tue, 25 Sep 2012 13:32:05 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8PDW5X0037505; Tue, 25 Sep 2012 13:32:05 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8PDW57L037503; Tue, 25 Sep 2012 13:32:05 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201209251332.q8PDW57L037503@svn.freebsd.org> From: Tijl Coosemans Date: Tue, 25 Sep 2012 13:32:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240919 - stable/9/sys/cam/scsi X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Sep 2012 13:32:06 -0000 Author: tijl Date: Tue Sep 25 13:32:05 2012 New Revision: 240919 URL: http://svn.freebsd.org/changeset/base/240919 Log: MFC r240701: Fix a panic when trying to play invalid audio tracks. PR: kern/167340 Reported by: Michael L. Semon Modified: stable/9/sys/cam/scsi/scsi_cd.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/cam/scsi/scsi_cd.c ============================================================================== --- stable/9/sys/cam/scsi/scsi_cd.c Tue Sep 25 12:45:41 2012 (r240918) +++ stable/9/sys/cam/scsi/scsi_cd.c Tue Sep 25 13:32:05 2012 (r240919) @@ -1990,6 +1990,7 @@ cdioctl(struct disk *dp, u_long cmd, voi || (st > (softc->toc.header.ending_track - softc->toc.header.starting_track))) { error = EINVAL; + cam_periph_unlock(periph); break; } sentry = &softc->toc.entries[st].addr; From owner-svn-src-stable-9@FreeBSD.ORG Wed Sep 26 03:54:55 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D4EE6106566B; Wed, 26 Sep 2012 03:54:55 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BF42A8FC0A; Wed, 26 Sep 2012 03:54:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8Q3stxT048144; Wed, 26 Sep 2012 03:54:55 GMT (envelope-from alc@svn.freebsd.org) Received: (from alc@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8Q3stwH048142; Wed, 26 Sep 2012 03:54:55 GMT (envelope-from alc@svn.freebsd.org) Message-Id: <201209260354.q8Q3stwH048142@svn.freebsd.org> From: Alan Cox Date: Wed, 26 Sep 2012 03:54:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240947 - stable/9/sys/vm X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Sep 2012 03:54:56 -0000 Author: alc Date: Wed Sep 26 03:54:55 2012 New Revision: 240947 URL: http://svn.freebsd.org/changeset/base/240947 Log: MFC r240862 Address a race condition that was introduced in r238212. Unless the page queues lock is acquired before the page lock is released, there is no guarantee that the page will still be in that same page queue when vm_page_requeue() is called. Modified: stable/9/sys/vm/vm_pageout.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/vm/vm_pageout.c ============================================================================== --- stable/9/sys/vm/vm_pageout.c Wed Sep 26 03:45:42 2012 (r240946) +++ stable/9/sys/vm/vm_pageout.c Wed Sep 26 03:54:55 2012 (r240947) @@ -999,9 +999,9 @@ vm_pageout_scan(int pass) * Those objects are in a "rundown" state. */ if (!swap_pageouts_ok || (object->flags & OBJ_DEAD)) { + vm_page_lock_queues(); vm_page_unlock(m); VM_OBJECT_UNLOCK(object); - vm_page_lock_queues(); queues_locked = TRUE; vm_page_requeue(m); goto relock_queues; From owner-svn-src-stable-9@FreeBSD.ORG Wed Sep 26 09:22:29 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7127B106566B; Wed, 26 Sep 2012 09:22:29 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 01C0C8FC0A; Wed, 26 Sep 2012 09:22:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8Q9MSuN098605; Wed, 26 Sep 2012 09:22:28 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8Q9MSCM098594; Wed, 26 Sep 2012 09:22:28 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201209260922.q8Q9MSCM098594@svn.freebsd.org> From: Konstantin Belousov Date: Wed, 26 Sep 2012 09:22:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240950 - in stable/9/sys: amd64/conf conf dev/random i386/conf modules/random X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Sep 2012 09:22:29 -0000 Author: kib Date: Wed Sep 26 09:22:28 2012 New Revision: 240950 URL: http://svn.freebsd.org/changeset/base/240950 Log: MFC r240135: Add support for new Intel on-CPU Bull Mountain random number generator. MFC r240455: Rename the IVY_RNG option to RDRAND_RNG. Added: stable/9/sys/dev/random/ivy.c - copied, changed from r240135, head/sys/dev/random/ivy.c Deleted: stable/9/sys/dev/random/nehemiah.h Modified: stable/9/sys/amd64/conf/GENERIC stable/9/sys/conf/files.amd64 stable/9/sys/conf/files.i386 stable/9/sys/conf/options.amd64 stable/9/sys/conf/options.i386 stable/9/sys/dev/random/nehemiah.c stable/9/sys/dev/random/probe.c stable/9/sys/i386/conf/GENERIC stable/9/sys/modules/random/Makefile Directory Properties: stable/9/sys/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/dev/ (props changed) stable/9/sys/modules/ (props changed) Modified: stable/9/sys/amd64/conf/GENERIC ============================================================================== --- stable/9/sys/amd64/conf/GENERIC Wed Sep 26 08:57:12 2012 (r240949) +++ stable/9/sys/amd64/conf/GENERIC Wed Sep 26 09:22:28 2012 (r240950) @@ -272,6 +272,8 @@ device wpi # Intel 3945ABG wireless NI # Pseudo devices. device loop # Network loopback device random # Entropy device +options PADLOCK_RNG # VIA Padlock RNG +options RDRAND_RNG # Intel Bull Mountain RNG device ether # Ethernet support device vlan # 802.1Q VLAN support device tun # Packet tunnel. Modified: stable/9/sys/conf/files.amd64 ============================================================================== --- stable/9/sys/conf/files.amd64 Wed Sep 26 08:57:12 2012 (r240949) +++ stable/9/sys/conf/files.amd64 Wed Sep 26 09:22:28 2012 (r240950) @@ -216,7 +216,8 @@ dev/lindev/lindev.c optional lindev dev/nfe/if_nfe.c optional nfe pci dev/nve/if_nve.c optional nve pci dev/nvram/nvram.c optional nvram isa -dev/random/nehemiah.c optional random +dev/random/ivy.c optional random rdrand_rng +dev/random/nehemiah.c optional random padlock_rng dev/qlxgb/qla_dbg.c optional qlxgb pci dev/qlxgb/qla_hw.c optional qlxgb pci dev/qlxgb/qla_ioctl.c optional qlxgb pci Modified: stable/9/sys/conf/files.i386 ============================================================================== --- stable/9/sys/conf/files.i386 Wed Sep 26 08:57:12 2012 (r240949) +++ stable/9/sys/conf/files.i386 Wed Sep 26 09:22:28 2012 (r240950) @@ -226,7 +226,8 @@ dev/nfe/if_nfe.c optional nfe pci dev/nve/if_nve.c optional nve pci dev/nvram/nvram.c optional nvram isa dev/pcf/pcf_isa.c optional pcf -dev/random/nehemiah.c optional random +dev/random/ivy.c optional random rdrand_rng +dev/random/nehemiah.c optional random padlock_rng dev/sbni/if_sbni.c optional sbni dev/sbni/if_sbni_isa.c optional sbni isa dev/sbni/if_sbni_pci.c optional sbni pci Modified: stable/9/sys/conf/options.amd64 ============================================================================== --- stable/9/sys/conf/options.amd64 Wed Sep 26 08:57:12 2012 (r240949) +++ stable/9/sys/conf/options.amd64 Wed Sep 26 09:22:28 2012 (r240950) @@ -68,3 +68,7 @@ XENHVM opt_global.h # options for the Intel C600 SAS driver (isci) ISCI_LOGGING opt_isci.h + +# hw random number generators for random(4) +PADLOCK_RNG opt_cpu.h +RDRAND_RNG opt_cpu.h Modified: stable/9/sys/conf/options.i386 ============================================================================== --- stable/9/sys/conf/options.i386 Wed Sep 26 08:57:12 2012 (r240949) +++ stable/9/sys/conf/options.i386 Wed Sep 26 09:22:28 2012 (r240950) @@ -123,3 +123,7 @@ XENHVM opt_global.h # options for the Intel C600 SAS driver (isci) ISCI_LOGGING opt_isci.h + +# hw random number generators for random(4) +PADLOCK_RNG opt_cpu.h +RDRAND_RNG opt_cpu.h Copied and modified: stable/9/sys/dev/random/ivy.c (from r240135, head/sys/dev/random/ivy.c) ============================================================================== --- head/sys/dev/random/ivy.c Wed Sep 5 13:18:51 2012 (r240135, copy source) +++ stable/9/sys/dev/random/ivy.c Wed Sep 26 09:22:28 2012 (r240950) @@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$"); #include "opt_cpu.h" -#ifdef IVY_RNG +#ifdef RDRAND_RNG #include #include Modified: stable/9/sys/dev/random/nehemiah.c ============================================================================== --- stable/9/sys/dev/random/nehemiah.c Wed Sep 26 08:57:12 2012 (r240949) +++ stable/9/sys/dev/random/nehemiah.c Wed Sep 26 09:22:28 2012 (r240950) @@ -28,6 +28,10 @@ #include __FBSDID("$FreeBSD$"); +#include "opt_cpu.h" + +#ifdef PADLOCK_RNG + #include #include #include @@ -203,3 +207,5 @@ random_nehemiah_read(void *buf, int c) mtx_unlock(&random_nehemiah_mtx); return (c); } + +#endif Modified: stable/9/sys/dev/random/probe.c ============================================================================== --- stable/9/sys/dev/random/probe.c Wed Sep 26 08:57:12 2012 (r240949) +++ stable/9/sys/dev/random/probe.c Wed Sep 26 09:22:28 2012 (r240950) @@ -28,12 +28,17 @@ #include __FBSDID("$FreeBSD$"); +#if defined(__amd64__) || (defined(__i386__) && !defined(PC98)) +#include "opt_cpu.h" +#endif + #include #include +#include +#include #include #include #include -#include #include #if defined(__amd64__) || (defined(__i386__) && !defined(PC98)) @@ -45,7 +50,15 @@ __FBSDID("$FreeBSD$"); #include #include -#include + +#if defined(__amd64__) || (defined(__i386__) && !defined(PC98)) +#ifdef PADLOCK_RNG +extern struct random_systat random_nehemiah; +#endif +#ifdef RDRAND_RNG +extern struct random_systat random_ivy; +#endif +#endif void random_ident_hardware(struct random_systat *systat) @@ -56,8 +69,25 @@ random_ident_hardware(struct random_syst /* Then go looking for hardware */ #if defined(__amd64__) || (defined(__i386__) && !defined(PC98)) +#ifdef PADLOCK_RNG if (via_feature_rng & VIA_HAS_RNG) { - *systat = random_nehemiah; + int enable; + + enable = 1; + TUNABLE_INT_FETCH("hw.nehemiah_rng_enable", &enable); + if (enable) + *systat = random_nehemiah; } #endif +#ifdef RDRAND_RNG + if (cpu_feature2 & CPUID2_RDRAND) { + int enable; + + enable = 1; + TUNABLE_INT_FETCH("hw.ivy_rng_enable", &enable); + if (enable) + *systat = random_ivy; + } +#endif +#endif } Modified: stable/9/sys/i386/conf/GENERIC ============================================================================== --- stable/9/sys/i386/conf/GENERIC Wed Sep 26 08:57:12 2012 (r240949) +++ stable/9/sys/i386/conf/GENERIC Wed Sep 26 09:22:28 2012 (r240950) @@ -285,6 +285,8 @@ device wpi # Intel 3945ABG wireless NI # Pseudo devices. device loop # Network loopback device random # Entropy device +options PADLOCK_RNG # VIA Padlock RNG +options RDRAND_RNG # Intel Bull Mountain RNG device ether # Ethernet support device vlan # 802.1Q VLAN support device tun # Packet tunnel. Modified: stable/9/sys/modules/random/Makefile ============================================================================== --- stable/9/sys/modules/random/Makefile Wed Sep 26 08:57:12 2012 (r240949) +++ stable/9/sys/modules/random/Makefile Wed Sep 26 09:22:28 2012 (r240950) @@ -8,10 +8,11 @@ KMOD= random SRCS= randomdev.c probe.c .if ${MACHINE} == "amd64" || ${MACHINE} == "i386" SRCS+= nehemiah.c +SRCS+= ivy.c .endif SRCS+= randomdev_soft.c yarrow.c hash.c SRCS+= rijndael-alg-fst.c rijndael-api-fst.c sha2.c -SRCS+= bus_if.h device_if.h vnode_if.h +SRCS+= bus_if.h device_if.h vnode_if.h opt_cpu.h CFLAGS+= -I${.CURDIR}/../.. From owner-svn-src-stable-9@FreeBSD.ORG Wed Sep 26 10:58:16 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 14D501065672; Wed, 26 Sep 2012 10:58:16 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D9F6D8FC08; Wed, 26 Sep 2012 10:58:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8QAwFAR013992; Wed, 26 Sep 2012 10:58:15 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8QAwFxQ013989; Wed, 26 Sep 2012 10:58:15 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201209261058.q8QAwFxQ013989@svn.freebsd.org> From: Martin Matuska Date: Wed, 26 Sep 2012 10:58:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240957 - stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Sep 2012 10:58:16 -0000 Author: mm Date: Wed Sep 26 10:58:15 2012 New Revision: 240957 URL: http://svn.freebsd.org/changeset/base/240957 Log: MFC r236248-r236250: MFC r236248 (pjd): Remove unused variable. MFC r236249 (pjd): Eliminate 'where' argument, we don't use it. MFC r236250 (pjd): Tighten up the assertion: because size can't be 0 and even if sm_space is equal to sm_size, any 'sm_space - size' will be less than sm_size. Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c ============================================================================== --- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c Wed Sep 26 10:07:53 2012 (r240956) +++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c Wed Sep 26 10:58:15 2012 (r240957) @@ -67,7 +67,6 @@ int zfs_resilver_min_time_ms = 3000; /* boolean_t zfs_no_scrub_io = B_FALSE; /* set to disable scrub i/o */ boolean_t zfs_no_scrub_prefetch = B_FALSE; /* set to disable srub prefetching */ enum ddt_class zfs_scrub_ddt_class_max = DDT_CLASS_DUPLICATE; -int dsl_scan_delay_completion = B_FALSE; /* set to delay scan completion */ #define DSL_SCAN_IS_SCRUB_RESILVER(scn) \ ((scn)->scn_phys.scn_func == POOL_SCAN_SCRUB || \ Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c ============================================================================== --- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c Wed Sep 26 10:07:53 2012 (r240956) +++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c Wed Sep 26 10:58:15 2012 (r240957) @@ -149,7 +149,6 @@ space_map_add(space_map_t *sm, uint64_t void space_map_remove(space_map_t *sm, uint64_t start, uint64_t size) { - avl_index_t where; space_seg_t ssearch, *ss, *newseg; uint64_t end = start + size; int left_over, right_over; @@ -161,7 +160,7 @@ space_map_remove(space_map_t *sm, uint64 ssearch.ss_start = start; ssearch.ss_end = end; - ss = avl_find(&sm->sm_root, &ssearch, &where); + ss = avl_find(&sm->sm_root, &ssearch, NULL); /* Make sure we completely overlap with someone */ if (ss == NULL) { @@ -172,7 +171,7 @@ space_map_remove(space_map_t *sm, uint64 } VERIFY3U(ss->ss_start, <=, start); VERIFY3U(ss->ss_end, >=, end); - VERIFY(sm->sm_space - size <= sm->sm_size); + VERIFY(sm->sm_space - size < sm->sm_size); left_over = (ss->ss_start != start); right_over = (ss->ss_end != end); From owner-svn-src-stable-9@FreeBSD.ORG Wed Sep 26 12:36:10 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 60944106564A; Wed, 26 Sep 2012 12:36:10 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 41EC48FC08; Wed, 26 Sep 2012 12:36:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8QCaAjv027046; Wed, 26 Sep 2012 12:36:10 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8QCaAgQ027039; Wed, 26 Sep 2012 12:36:10 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201209261236.q8QCaAgQ027039@svn.freebsd.org> From: Martin Matuska Date: Wed, 26 Sep 2012 12:36:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240959 - in stable/9/cddl: lib/libzfs sbin/zfs sbin/zpool usr.bin/zinject usr.bin/ztest usr.sbin/zdb X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Sep 2012 12:36:10 -0000 Author: mm Date: Wed Sep 26 12:36:09 2012 New Revision: 240959 URL: http://svn.freebsd.org/changeset/base/240959 Log: MFC r226940 (rmh): Fix a few gratuitous library dependencies. Some of the ZFS utilities are linked with libraries they don't use: - zinject doesn't use libavl - ztest doesn't use libz - zdb uses neither libavl nor libz - zfs uses neither libbsdxml nor libm, nor libsbuf - zpool uses neither libbsdxml nor libm, nor libsbuf In addition, libzfs needs libm because it uses pow(), however it isn't linked with -lm. This went unnoticed because all its users had -lm before. Modified: stable/9/cddl/lib/libzfs/Makefile stable/9/cddl/sbin/zfs/Makefile stable/9/cddl/sbin/zpool/Makefile stable/9/cddl/usr.bin/zinject/Makefile stable/9/cddl/usr.bin/ztest/Makefile stable/9/cddl/usr.sbin/zdb/Makefile Directory Properties: stable/9/cddl/ (props changed) stable/9/cddl/lib/ (props changed) Modified: stable/9/cddl/lib/libzfs/Makefile ============================================================================== --- stable/9/cddl/lib/libzfs/Makefile Wed Sep 26 11:12:09 2012 (r240958) +++ stable/9/cddl/lib/libzfs/Makefile Wed Sep 26 12:36:09 2012 (r240959) @@ -6,8 +6,8 @@ .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common LIB= zfs -DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} -LDADD= -lmd -lpthread -lumem -lutil +DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} +LDADD= -lmd -lpthread -lumem -lutil -lm SRCS= deviceid.c \ fsshare.c \ Modified: stable/9/cddl/sbin/zfs/Makefile ============================================================================== --- stable/9/cddl/sbin/zfs/Makefile Wed Sep 26 11:12:09 2012 (r240958) +++ stable/9/cddl/sbin/zfs/Makefile Wed Sep 26 12:36:09 2012 (r240959) @@ -21,8 +21,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs -DPADD= ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \ +DPADD= ${LIBGEOM} ${LIBNVPAIR} ${LIBUMEM} \ ${LIBUTIL} ${LIBUUTIL} ${LIBZFS} -LDADD= -lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs +LDADD= -lgeom -lnvpair -lumem -lutil -luutil -lzfs .include Modified: stable/9/cddl/sbin/zpool/Makefile ============================================================================== --- stable/9/cddl/sbin/zpool/Makefile Wed Sep 26 11:12:09 2012 (r240958) +++ stable/9/cddl/sbin/zpool/Makefile Wed Sep 26 12:36:09 2012 (r240959) @@ -26,8 +26,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common -DPADD= ${LIBAVL} ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \ +DPADD= ${LIBAVL} ${LIBGEOM} ${LIBNVPAIR} \ ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS} -LDADD= -lavl -lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs +LDADD= -lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs .include Modified: stable/9/cddl/usr.bin/zinject/Makefile ============================================================================== --- stable/9/cddl/usr.bin/zinject/Makefile Wed Sep 26 11:12:09 2012 (r240958) +++ stable/9/cddl/usr.bin/zinject/Makefile Wed Sep 26 12:36:09 2012 (r240959) @@ -19,8 +19,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../lib/libumem -DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \ +DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \ ${LIBZFS} ${LIBZPOOL} -LDADD= -lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool +LDADD= -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool .include Modified: stable/9/cddl/usr.bin/ztest/Makefile ============================================================================== --- stable/9/cddl/usr.bin/ztest/Makefile Wed Sep 26 11:12:09 2012 (r240958) +++ stable/9/cddl/usr.bin/ztest/Makefile Wed Sep 26 12:36:09 2012 (r240959) @@ -18,8 +18,8 @@ CFLAGS+= -I${.CURDIR}/../../contrib/open CFLAGS+= -I${.CURDIR}/../../lib/libumem DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ - ${LIBPTHREAD} ${LIBZ} ${LIBAVL} -LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl + ${LIBPTHREAD} ${LIBAVL} +LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lavl CSTD= c99 Modified: stable/9/cddl/usr.sbin/zdb/Makefile ============================================================================== --- stable/9/cddl/usr.sbin/zdb/Makefile Wed Sep 26 11:12:09 2012 (r240958) +++ stable/9/cddl/usr.sbin/zdb/Makefile Wed Sep 26 12:36:09 2012 (r240959) @@ -23,9 +23,9 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/ CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../lib/libumem -DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \ - ${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL} -LDADD= -lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool +DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \ + ${LIBUUTIL} ${LIBZFS} ${LIBZPOOL} +LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs -lzpool .include From owner-svn-src-stable-9@FreeBSD.ORG Wed Sep 26 13:57:17 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7F19D106566B; Wed, 26 Sep 2012 13:57:17 +0000 (UTC) (envelope-from zont@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 67B7B8FC1F; Wed, 26 Sep 2012 13:57:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8QDvHj5037669; Wed, 26 Sep 2012 13:57:17 GMT (envelope-from zont@svn.freebsd.org) Received: (from zont@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8QDvHTL037667; Wed, 26 Sep 2012 13:57:17 GMT (envelope-from zont@svn.freebsd.org) Message-Id: <201209261357.q8QDvHTL037667@svn.freebsd.org> From: Andrey Zonov Date: Wed, 26 Sep 2012 13:57:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240961 - stable/9/sbin/fsck_ffs X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Sep 2012 13:57:17 -0000 Author: zont Date: Wed Sep 26 13:57:16 2012 New Revision: 240961 URL: http://svn.freebsd.org/changeset/base/240961 Log: MFC r240463: - Fix a typo in debug message. Modified: stable/9/sbin/fsck_ffs/suj.c Directory Properties: stable/9/sbin/fsck_ffs/ (props changed) Modified: stable/9/sbin/fsck_ffs/suj.c ============================================================================== --- stable/9/sbin/fsck_ffs/suj.c Wed Sep 26 12:36:22 2012 (r240960) +++ stable/9/sbin/fsck_ffs/suj.c Wed Sep 26 13:57:16 2012 (r240961) @@ -882,7 +882,7 @@ ino_isat(ino_t parent, off_t diroff, ino printf("Directory %d has bad mode %o\n", parent, *mode); else - printf("Directory %d zero inode\n", parent); + printf("Directory %d has zero mode\n", parent); } return (0); } From owner-svn-src-stable-9@FreeBSD.ORG Wed Sep 26 21:55:14 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 625DC106566C; Wed, 26 Sep 2012 21:55:14 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4D9688FC14; Wed, 26 Sep 2012 21:55:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8QLtE7k099307; Wed, 26 Sep 2012 21:55:14 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8QLtEIk099305; Wed, 26 Sep 2012 21:55:14 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <201209262155.q8QLtEIk099305@svn.freebsd.org> From: Ed Maste Date: Wed, 26 Sep 2012 21:55:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240975 - stable/9/sys/dev/netmap X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Sep 2012 21:55:14 -0000 Author: emaste Date: Wed Sep 26 21:55:13 2012 New Revision: 240975 URL: http://svn.freebsd.org/changeset/base/240975 Log: Add missing mtx_destroy This is a direct commit to stable/9 as the locking is somewhat different in HEAD due to the VALE bridge work (r238812). Modified: stable/9/sys/dev/netmap/netmap.c Modified: stable/9/sys/dev/netmap/netmap.c ============================================================================== --- stable/9/sys/dev/netmap/netmap.c Wed Sep 26 20:47:39 2012 (r240974) +++ stable/9/sys/dev/netmap/netmap.c Wed Sep 26 21:55:13 2012 (r240975) @@ -1040,6 +1040,7 @@ netmap_detach(struct ifnet *ifp) knlist_destroy(&na->rx_rings[i].si.si_note); mtx_destroy(&na->rx_rings[i].q_lock); } + mtx_destroy(&na->core_lock); knlist_destroy(&na->tx_si.si_note); knlist_destroy(&na->rx_si.si_note); bzero(na, sizeof(*na)); From owner-svn-src-stable-9@FreeBSD.ORG Wed Sep 26 22:13:04 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 062501065672; Wed, 26 Sep 2012 22:13:04 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E4E918FC25; Wed, 26 Sep 2012 22:13:03 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8QMD3KN001712; Wed, 26 Sep 2012 22:13:03 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8QMD3WI001710; Wed, 26 Sep 2012 22:13:03 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <201209262213.q8QMD3WI001710@svn.freebsd.org> From: Ed Maste Date: Wed, 26 Sep 2012 22:13:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240976 - stable/9/sys/dev/netmap X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Sep 2012 22:13:04 -0000 Author: emaste Date: Wed Sep 26 22:13:03 2012 New Revision: 240976 URL: http://svn.freebsd.org/changeset/base/240976 Log: MFC part of r239149: Comment out the knlist_destroy for now as there is currently no knlist_init. Modified: stable/9/sys/dev/netmap/netmap.c Modified: stable/9/sys/dev/netmap/netmap.c ============================================================================== --- stable/9/sys/dev/netmap/netmap.c Wed Sep 26 21:55:13 2012 (r240975) +++ stable/9/sys/dev/netmap/netmap.c Wed Sep 26 22:13:03 2012 (r240976) @@ -1033,16 +1033,17 @@ netmap_detach(struct ifnet *ifp) return; for (i = 0; i < na->num_tx_rings + 1; i++) { - knlist_destroy(&na->tx_rings[i].si.si_note); + /* knlist_destroy(&na->tx_rings[i].si.si_note); */ mtx_destroy(&na->tx_rings[i].q_lock); } for (i = 0; i < na->num_rx_rings + 1; i++) { - knlist_destroy(&na->rx_rings[i].si.si_note); + /* knlist_destroy(&na->rx_rings[i].si.si_note); */ mtx_destroy(&na->rx_rings[i].q_lock); } mtx_destroy(&na->core_lock); - knlist_destroy(&na->tx_si.si_note); - knlist_destroy(&na->rx_si.si_note); + /* XXX kqueue(9) needed; these will mirror knlist_init. */ + /* knlist_destroy(&na->tx_si.si_note); */ + /* knlist_destroy(&na->rx_si.si_note); */ bzero(na, sizeof(*na)); WNA(ifp) = NULL; free(na, M_DEVBUF); From owner-svn-src-stable-9@FreeBSD.ORG Wed Sep 26 23:07:01 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7A514106566B; Wed, 26 Sep 2012 23:07:01 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 63CCE8FC0C; Wed, 26 Sep 2012 23:07:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8QN71HN009012; Wed, 26 Sep 2012 23:07:01 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8QN71in009007; Wed, 26 Sep 2012 23:07:01 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201209262307.q8QN71in009007@svn.freebsd.org> From: Rick Macklem Date: Wed, 26 Sep 2012 23:07:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240977 - in stable/9/sys/fs: nfs nfsclient X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Sep 2012 23:07:01 -0000 Author: rmacklem Date: Wed Sep 26 23:07:00 2012 New Revision: 240977 URL: http://svn.freebsd.org/changeset/base/240977 Log: MFC: r240289 Add a simple printf() based debug facility to the new nfs client. Use it for a printf() that can be harmlessly generated for mmap()'d files. It will be used extensively for the NFSv4.1 client. Debugging printf()s are enabled by setting vfs.nfs.debuglevel to a non-zero value. The higher the value, the more debugging printf()s. Modified: stable/9/sys/fs/nfs/nfs_commonport.c stable/9/sys/fs/nfs/nfscl.h stable/9/sys/fs/nfsclient/nfs_clrpcops.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/amd64/include/xen/ (props changed) stable/9/sys/boot/ (props changed) stable/9/sys/boot/i386/efi/ (props changed) stable/9/sys/boot/ia64/efi/ (props changed) stable/9/sys/boot/ia64/ski/ (props changed) stable/9/sys/boot/powerpc/boot1.chrp/ (props changed) stable/9/sys/boot/powerpc/ofw/ (props changed) stable/9/sys/cddl/contrib/opensolaris/ (props changed) stable/9/sys/conf/ (props changed) stable/9/sys/contrib/dev/acpica/ (props changed) stable/9/sys/contrib/octeon-sdk/ (props changed) stable/9/sys/contrib/pf/ (props changed) stable/9/sys/contrib/x86emu/ (props changed) stable/9/sys/dev/ (props changed) stable/9/sys/dev/e1000/ (props changed) stable/9/sys/dev/isp/ (props changed) stable/9/sys/dev/ixgbe/ (props changed) stable/9/sys/dev/puc/ (props changed) stable/9/sys/fs/ (props changed) stable/9/sys/fs/ntfs/ (props changed) stable/9/sys/modules/ (props changed) Modified: stable/9/sys/fs/nfs/nfs_commonport.c ============================================================================== --- stable/9/sys/fs/nfs/nfs_commonport.c Wed Sep 26 22:13:03 2012 (r240976) +++ stable/9/sys/fs/nfs/nfs_commonport.c Wed Sep 26 23:07:00 2012 (r240977) @@ -60,6 +60,7 @@ struct mount nfsv4root_mnt; int newnfs_numnfsd = 0; struct nfsstats newnfsstats; int nfs_numnfscbd = 0; +int nfscl_debuglevel = 0; char nfsv4_callbackaddr[INET6_ADDRSTRLEN]; struct callout newnfsd_callout; void (*nfsd_call_servertimer)(void) = NULL; @@ -76,6 +77,8 @@ SYSCTL_INT(_vfs_nfs, OID_AUTO, realign_c SYSCTL_STRING(_vfs_nfs, OID_AUTO, callback_addr, CTLFLAG_RW, nfsv4_callbackaddr, sizeof(nfsv4_callbackaddr), "NFSv4 callback addr for server to use"); +SYSCTL_INT(_vfs_nfs, OID_AUTO, debuglevel, CTLFLAG_RW, &nfscl_debuglevel, + 0, "Debug level for new nfs client"); /* * Defines for malloc Modified: stable/9/sys/fs/nfs/nfscl.h ============================================================================== --- stable/9/sys/fs/nfs/nfscl.h Wed Sep 26 22:13:03 2012 (r240976) +++ stable/9/sys/fs/nfs/nfscl.h Wed Sep 26 23:07:00 2012 (r240977) @@ -68,4 +68,10 @@ struct nfsv4node { #define NFSSATTR_SIZENEG1 0x4 #define NFSSATTR_SIZERDEV 0x8 +/* Use this macro for debug printfs. */ +#define NFSCL_DEBUG(level, ...) do { \ + if (nfscl_debuglevel >= (level)) \ + printf(__VA_ARGS__); \ + } while (0) + #endif /* _NFS_NFSCL_H */ Modified: stable/9/sys/fs/nfsclient/nfs_clrpcops.c ============================================================================== --- stable/9/sys/fs/nfsclient/nfs_clrpcops.c Wed Sep 26 22:13:03 2012 (r240976) +++ stable/9/sys/fs/nfsclient/nfs_clrpcops.c Wed Sep 26 23:07:00 2012 (r240977) @@ -56,6 +56,7 @@ extern u_int32_t newnfs_false, newnfs_tr extern nfstype nfsv34_type[9]; extern int nfsrv_useacl; extern char nfsv4_callbackaddr[INET6_ADDRSTRLEN]; +extern int nfscl_debuglevel; NFSCLSTATEMUTEX; int nfstest_outofseq = 0; int nfscl_assumeposixlocks = 1; @@ -1398,7 +1399,7 @@ nfsrpc_write(vnode_t vp, struct uio *uio if (stateid.other[0] == 0 && stateid.other[1] == 0 && stateid.other[2] == 0) { nostateid = 1; - printf("stateid0 in write\n"); + NFSCL_DEBUG(1, "stateid0 in write\n"); } } From owner-svn-src-stable-9@FreeBSD.ORG Thu Sep 27 04:05:40 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 62CCD1065670; Thu, 27 Sep 2012 04:05:40 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4D9398FC0A; Thu, 27 Sep 2012 04:05:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8R45eWd048179; Thu, 27 Sep 2012 04:05:40 GMT (envelope-from pfg@svn.freebsd.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8R45eBc048176; Thu, 27 Sep 2012 04:05:40 GMT (envelope-from pfg@svn.freebsd.org) Message-Id: <201209270405.q8R45eBc048176@svn.freebsd.org> From: "Pedro F. Giffuni" Date: Thu, 27 Sep 2012 04:05:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240979 - in stable/9: lib/libc/rpc sys/rpc X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Sep 2012 04:05:40 -0000 Author: pfg Date: Thu Sep 27 04:05:39 2012 New Revision: 240979 URL: http://svn.freebsd.org/changeset/base/240979 Log: MFC 240880: Revert a change from Bull's NFSv4 libtirpc implementation: libtirpc: be sure to free cl_netid and cl_tp This change is causing rpc.lockd to exit after startup. Reported by: David Wolfskill Modified: stable/9/lib/libc/rpc/clnt_vc.c stable/9/sys/rpc/clnt_vc.c Modified: stable/9/lib/libc/rpc/clnt_vc.c ============================================================================== --- stable/9/lib/libc/rpc/clnt_vc.c Thu Sep 27 00:27:58 2012 (r240978) +++ stable/9/lib/libc/rpc/clnt_vc.c Thu Sep 27 04:05:39 2012 (r240979) @@ -672,10 +672,6 @@ clnt_vc_destroy(cl) if (ct->ct_addr.buf) free(ct->ct_addr.buf); mem_free(ct, sizeof(struct ct_data)); - if (cl->cl_netid && cl->cl_netid[0]) - mem_free(cl->cl_netid, strlen(cl->cl_netid) +1); - if (cl->cl_tp && cl->cl_tp[0]) - mem_free(cl->cl_tp, strlen(cl->cl_tp) +1); mem_free(cl, sizeof(CLIENT)); mutex_unlock(&clnt_fd_lock); thr_sigsetmask(SIG_SETMASK, &(mask), NULL); Modified: stable/9/sys/rpc/clnt_vc.c ============================================================================== --- stable/9/sys/rpc/clnt_vc.c Thu Sep 27 00:27:58 2012 (r240978) +++ stable/9/sys/rpc/clnt_vc.c Thu Sep 27 04:05:39 2012 (r240979) @@ -836,10 +836,6 @@ clnt_vc_destroy(CLIENT *cl) soclose(so); } mem_free(ct, sizeof(struct ct_data)); - if (cl->cl_netid && cl->cl_netid[0]) - mem_free(cl->cl_netid, strlen(cl->cl_netid) +1); - if (cl->cl_tp && cl->cl_tp[0]) - mem_free(cl->cl_tp, strlen(cl->cl_tp) +1); mem_free(cl, sizeof(CLIENT)); } From owner-svn-src-stable-9@FreeBSD.ORG Thu Sep 27 08:05:00 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5267C106564A; Thu, 27 Sep 2012 08:05:00 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3BF508FC12; Thu, 27 Sep 2012 08:05:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8R850fM079384; Thu, 27 Sep 2012 08:05:00 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8R850DB079382; Thu, 27 Sep 2012 08:05:00 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201209270805.q8R850DB079382@svn.freebsd.org> From: Alexander Motin Date: Thu, 27 Sep 2012 08:05:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240986 - stable/9/sys/dev/sound/pci/hda X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Sep 2012 08:05:00 -0000 Author: mav Date: Thu Sep 27 08:04:59 2012 New Revision: 240986 URL: http://svn.freebsd.org/changeset/base/240986 Log: MFC r240884: Fix panic caused by wrong pointer dereference, left after pin sense rewrite at r230551. Also while there, make sense polling use reported for each node separately instead of reporting accumulated total status. Modified: stable/9/sys/dev/sound/pci/hda/hdaa.c Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/sound/pci/hda/hdaa.c ============================================================================== --- stable/9/sys/dev/sound/pci/hda/hdaa.c Thu Sep 27 07:13:21 2012 (r240985) +++ stable/9/sys/dev/sound/pci/hda/hdaa.c Thu Sep 27 08:04:59 2012 (r240986) @@ -627,7 +627,7 @@ hdaa_sense_init(struct hdaa_devinfo *dev (HDA_CONFIG_DEFAULTCONF_MISC(w->wclass.pin.config) & 1) != 0) { device_printf(devinfo->dev, "No presence detection support at nid %d\n", - as[i].pins[15]); + w->nid); } else { if (w->unsol < 0) poll = 1; @@ -636,7 +636,7 @@ hdaa_sense_init(struct hdaa_devinfo *dev "Headphones redirection for " "association %d nid=%d using %s.\n", w->bindas, w->nid, - (poll != 0) ? "polling" : + (w->unsol < 0) ? "polling" : "unsolicited responses"); ); }; From owner-svn-src-stable-9@FreeBSD.ORG Thu Sep 27 09:00:23 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 36A7B106564A; Thu, 27 Sep 2012 09:00:23 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 213468FC0C; Thu, 27 Sep 2012 09:00:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8R90Mml086436; Thu, 27 Sep 2012 09:00:22 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8R90MJr086434; Thu, 27 Sep 2012 09:00:22 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201209270900.q8R90MJr086434@svn.freebsd.org> From: Konstantin Belousov Date: Thu, 27 Sep 2012 09:00:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240989 - stable/9/sys/vm X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Sep 2012 09:00:23 -0000 Author: kib Date: Thu Sep 27 09:00:22 2012 New Revision: 240989 URL: http://svn.freebsd.org/changeset/base/240989 Log: MFC r240741: Plug the accounting leak for the wired pages when msync(MS_INVALIDATE) is performed on the vnode mapping which is wired in other address space. Modified: stable/9/sys/vm/vm_object.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/vm/vm_object.c ============================================================================== --- stable/9/sys/vm/vm_object.c Thu Sep 27 08:24:34 2012 (r240988) +++ stable/9/sys/vm/vm_object.c Thu Sep 27 09:00:22 2012 (r240989) @@ -1893,8 +1893,13 @@ again: if ((options & OBJPR_NOTMAPPED) == 0) { pmap_remove_all(p); /* Account for removal of wired mappings. */ - if (wirings != 0) - p->wire_count -= wirings; + if (wirings != 0) { + KASSERT(p->wire_count == wirings, + ("inconsistent wire count %d %d %p", + p->wire_count, wirings, p)); + p->wire_count = 0; + atomic_subtract_int(&cnt.v_wire_count, 1); + } } vm_page_free(p); vm_page_unlock(p); From owner-svn-src-stable-9@FreeBSD.ORG Thu Sep 27 13:37:31 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A5F66106564A; Thu, 27 Sep 2012 13:37:31 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8F3408FC0C; Thu, 27 Sep 2012 13:37:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8RDbVkr026642; Thu, 27 Sep 2012 13:37:31 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8RDbVoC026640; Thu, 27 Sep 2012 13:37:31 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <201209271337.q8RDbVoC026640@svn.freebsd.org> From: Ed Maste Date: Thu, 27 Sep 2012 13:37:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240995 - stable/9/sys/dev/netmap X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Sep 2012 13:37:31 -0000 Author: emaste Date: Thu Sep 27 13:37:30 2012 New Revision: 240995 URL: http://svn.freebsd.org/changeset/base/240995 Log: MFC part of r238812 and remainder of r239149 From r238812, move mtx_init of per-ring locks into NIOCREGIF ioctl handler. (Otherwise they're overwritten with zeros in netmap_if_new.) From r239149: Improve lock and unlock symmetry - Move destruction of per-ring locks to netmap_dtor_locked to mirror the initialization that happens in NIOCREGIF. Otherwise unloading a netmap- capable interface that was never put into netmap mode would try to mtx_destroy an uninitialized mutex, and panic. Modified: stable/9/sys/dev/netmap/netmap.c Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/dev/netmap/netmap.c ============================================================================== --- stable/9/sys/dev/netmap/netmap.c Thu Sep 27 10:56:25 2012 (r240994) +++ stable/9/sys/dev/netmap/netmap.c Thu Sep 27 13:37:30 2012 (r240995) @@ -186,13 +186,20 @@ netmap_dtor_locked(void *data) lim = na->tx_rings[i].nkr_num_slots; for (j = 0; j < lim; j++) netmap_free_buf(nifp, ring->slot[j].buf_idx); + /* knlist_destroy(&na->tx_rings[i].si.si_note); */ + mtx_destroy(&na->tx_rings[i].q_lock); } for (i = 0; i < na->num_rx_rings + 1; i++) { struct netmap_ring *ring = na->rx_rings[i].ring; lim = na->rx_rings[i].nkr_num_slots; for (j = 0; j < lim; j++) netmap_free_buf(nifp, ring->slot[j].buf_idx); + /* knlist_destroy(&na->rx_rings[i].si.si_note); */ + mtx_destroy(&na->rx_rings[i].q_lock); } + /* XXX kqueue(9) needed; these will mirror knlist_init. */ + /* knlist_destroy(&na->tx_si.si_note); */ + /* knlist_destroy(&na->rx_si.si_note); */ NMA_UNLOCK(); netmap_free_rings(na); wakeup(na); @@ -593,6 +600,10 @@ netmap_ioctl(__unused struct cdev *dev, /* Otherwise set the card in netmap mode * and make it use the shared buffers. */ + for (i = 0 ; i < na->num_tx_rings + 1; i++) + mtx_init(&na->tx_rings[i].q_lock, "nm_txq_lock", NULL, MTX_DEF); + for (i = 0 ; i < na->num_rx_rings + 1; i++) + mtx_init(&na->rx_rings[i].q_lock, "nm_rxq_lock", NULL, MTX_DEF); error = na->nm_register(ifp, 1); /* mode on */ if (error) netmap_dtor_locked(priv); @@ -970,7 +981,7 @@ netmap_lock_wrapper(struct ifnet *dev, i int netmap_attach(struct netmap_adapter *na, int num_queues) { - int i, n, size; + int n, size; void *buf; struct ifnet *ifp = na->ifp; @@ -999,13 +1010,14 @@ netmap_attach(struct netmap_adapter *na, ifp->if_capabilities |= IFCAP_NETMAP; na = buf; - if (na->nm_lock == NULL) - na->nm_lock = netmap_lock_wrapper; + /* Core lock initialized here. Others are initialized after + * netmap_if_new. + */ mtx_init(&na->core_lock, "netmap core lock", NULL, MTX_DEF); - for (i = 0 ; i < na->num_tx_rings + 1; i++) - mtx_init(&na->tx_rings[i].q_lock, "netmap txq lock", NULL, MTX_DEF); - for (i = 0 ; i < na->num_rx_rings + 1; i++) - mtx_init(&na->rx_rings[i].q_lock, "netmap rxq lock", NULL, MTX_DEF); + if (na->nm_lock == NULL) { + ND("using default locks for %s", ifp->if_xname); + na->nm_lock = netmap_lock_wrapper; + } } #ifdef linux D("netdev_ops %p", ifp->netdev_ops); @@ -1026,24 +1038,13 @@ netmap_attach(struct netmap_adapter *na, void netmap_detach(struct ifnet *ifp) { - u_int i; struct netmap_adapter *na = NA(ifp); if (!na) return; - for (i = 0; i < na->num_tx_rings + 1; i++) { - /* knlist_destroy(&na->tx_rings[i].si.si_note); */ - mtx_destroy(&na->tx_rings[i].q_lock); - } - for (i = 0; i < na->num_rx_rings + 1; i++) { - /* knlist_destroy(&na->rx_rings[i].si.si_note); */ - mtx_destroy(&na->rx_rings[i].q_lock); - } mtx_destroy(&na->core_lock); - /* XXX kqueue(9) needed; these will mirror knlist_init. */ - /* knlist_destroy(&na->tx_si.si_note); */ - /* knlist_destroy(&na->rx_si.si_note); */ + bzero(na, sizeof(*na)); WNA(ifp) = NULL; free(na, M_DEVBUF); From owner-svn-src-stable-9@FreeBSD.ORG Thu Sep 27 18:51:04 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6DE291065670; Thu, 27 Sep 2012 18:51:04 +0000 (UTC) (envelope-from trociny@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3E9528FC08; Thu, 27 Sep 2012 18:51:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8RIp4DE076140; Thu, 27 Sep 2012 18:51:04 GMT (envelope-from trociny@svn.freebsd.org) Received: (from trociny@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8RIp41D076138; Thu, 27 Sep 2012 18:51:04 GMT (envelope-from trociny@svn.freebsd.org) Message-Id: <201209271851.q8RIp41D076138@svn.freebsd.org> From: Mikolaj Golub Date: Thu, 27 Sep 2012 18:51:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r241003 - stable/9/usr.sbin/bsnmpd/modules/snmp_hostres X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Sep 2012 18:51:04 -0000 Author: trociny Date: Thu Sep 27 18:51:03 2012 New Revision: 241003 URL: http://svn.freebsd.org/changeset/base/241003 Log: MFC r240595: In snmp_hostres, device_map table is used for consistent device table indexing. When a device has gone it is not removed from device_map table but just its entry_p field is set to NULL. So when traversing device_map in disk_OS_get_ATA_disks() and disk_OS_get_MD_disks() check for entry_p being NULL, otherwise the bsnmpd crash is possible when a removed map entry is dereferenced. Before the fix, for disk_OS_get_ATA_disks() the crash could be easily reproduced running: atacontrol detach ata1 The crash was not observed in disk_OS_get_MD_disks() because currently snmp_hostres does no see md(4) disks: to get the device list it uses devinfo(3), which does not return md devices. Reported by: Miroslav Lachman 000.fbsd quip.cz Modified: stable/9/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c Directory Properties: stable/9/usr.sbin/bsnmpd/ (props changed) Modified: stable/9/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c ============================================================================== --- stable/9/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c Thu Sep 27 18:15:01 2012 (r241002) +++ stable/9/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c Thu Sep 27 18:51:03 2012 (r241003) @@ -287,6 +287,9 @@ disk_OS_get_ATA_disks(void) /* Walk over the device table looking for ata disks */ STAILQ_FOREACH(map, &device_map, link) { + /* Skip deleted entries. */ + if (map->entry_p == NULL) + continue; for (found = lookup; found->media != DSM_UNKNOWN; found++) { if (strncmp(map->name_key, found->dev_name, strlen(found->dev_name)) != 0) @@ -345,6 +348,9 @@ disk_OS_get_MD_disks(void) /* Look for md devices */ STAILQ_FOREACH(map, &device_map, link) { + /* Skip deleted entries. */ + if (map->entry_p == NULL) + continue; if (sscanf(map->name_key, "md%d", &unit) != 1) continue; From owner-svn-src-stable-9@FreeBSD.ORG Fri Sep 28 01:04:10 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A5CB1065672; Fri, 28 Sep 2012 01:04:10 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2A1A18FC08; Fri, 28 Sep 2012 01:04:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8S149ap039546; Fri, 28 Sep 2012 01:04:09 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8S149DB039543; Fri, 28 Sep 2012 01:04:09 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201209280104.q8S149DB039543@svn.freebsd.org> From: Eitan Adler Date: Fri, 28 Sep 2012 01:04:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r241016 - stable/9/lib/libfetch X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Sep 2012 01:04:10 -0000 Author: eadler Date: Fri Sep 28 01:04:09 2012 New Revision: 241016 URL: http://svn.freebsd.org/changeset/base/241016 Log: MFC r240495: Adding missing return statements during error conditions. PR: kern/171187 Approved by: cperciva (implicit) Modified: stable/9/lib/libfetch/file.c Directory Properties: stable/9/lib/libfetch/ (props changed) Modified: stable/9/lib/libfetch/file.c ============================================================================== --- stable/9/lib/libfetch/file.c Thu Sep 27 23:31:19 2012 (r241015) +++ stable/9/lib/libfetch/file.c Fri Sep 28 01:04:09 2012 (r241016) @@ -50,12 +50,15 @@ fetchXGetFile(struct url *u, struct url_ f = fopen(u->doc, "r"); - if (f == NULL) + if (f == NULL) { fetch_syserr(); + return (NULL); + } if (u->offset && fseeko(f, u->offset, SEEK_SET) == -1) { fclose(f); fetch_syserr(); + return (NULL); } fcntl(fileno(f), F_SETFD, FD_CLOEXEC); @@ -78,12 +81,15 @@ fetchPutFile(struct url *u, const char * else f = fopen(u->doc, "w+"); - if (f == NULL) + if (f == NULL) { fetch_syserr(); + return (NULL); + } if (u->offset && fseeko(f, u->offset, SEEK_SET) == -1) { fclose(f); fetch_syserr(); + return (NULL); } fcntl(fileno(f), F_SETFD, FD_CLOEXEC); From owner-svn-src-stable-9@FreeBSD.ORG Fri Sep 28 13:43:43 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4F55F106564A; Fri, 28 Sep 2012 13:43:43 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3A3B58FC17; Fri, 28 Sep 2012 13:43:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8SDhhKV050338; Fri, 28 Sep 2012 13:43:43 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8SDhhjr050336; Fri, 28 Sep 2012 13:43:43 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201209281343.q8SDhhjr050336@svn.freebsd.org> From: Jilles Tjoelker Date: Fri, 28 Sep 2012 13:43:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r241030 - stable/9/bin/sh X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Sep 2012 13:43:43 -0000 Author: jilles Date: Fri Sep 28 13:43:42 2012 New Revision: 241030 URL: http://svn.freebsd.org/changeset/base/241030 Log: MFC r240505: sh: Reduce code duplication: use setinputfile instead of open/setinputfd combination. Modified: stable/9/bin/sh/main.c Directory Properties: stable/9/bin/sh/ (props changed) Modified: stable/9/bin/sh/main.c ============================================================================== --- stable/9/bin/sh/main.c Fri Sep 28 12:29:25 2012 (r241029) +++ stable/9/bin/sh/main.c Fri Sep 28 13:43:42 2012 (r241030) @@ -266,14 +266,7 @@ read_profile(char *name) void readcmdfile(const char *name) { - int fd; - - INTOFF; - if ((fd = open(name, O_RDONLY)) >= 0) - setinputfd(fd, 1); - else - error("cannot open %s: %s", name, strerror(errno)); - INTON; + setinputfile(name, 1); cmdloop(0); popfile(); } From owner-svn-src-stable-9@FreeBSD.ORG Fri Sep 28 17:36:01 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 59A19106567C; Fri, 28 Sep 2012 17:36:01 +0000 (UTC) (envelope-from andreast@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 43E738FC25; Fri, 28 Sep 2012 17:36:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8SHa16s079958; Fri, 28 Sep 2012 17:36:01 GMT (envelope-from andreast@svn.freebsd.org) Received: (from andreast@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8SHa1dv079956; Fri, 28 Sep 2012 17:36:01 GMT (envelope-from andreast@svn.freebsd.org) Message-Id: <201209281736.q8SHa1dv079956@svn.freebsd.org> From: Andreas Tobler Date: Fri, 28 Sep 2012 17:36:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r241036 - stable/9/sys/boot/common X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Sep 2012 17:36:01 -0000 Author: andreast Date: Fri Sep 28 17:36:00 2012 New Revision: 241036 URL: http://svn.freebsd.org/changeset/base/241036 Log: MFC r240782: Implement elfN(reloc) for powerpc. With this change the kernel is now able to resolve dependencies of modules at boot time and load additional modules when needed. Modified: stable/9/sys/boot/common/reloc_elf.c Modified: stable/9/sys/boot/common/reloc_elf.c ============================================================================== --- stable/9/sys/boot/common/reloc_elf.c Fri Sep 28 17:34:34 2012 (r241035) +++ stable/9/sys/boot/common/reloc_elf.c Fri Sep 28 17:36:00 2012 (r241036) @@ -193,6 +193,31 @@ __elfN(reloc)(struct elf_file *ef, symad } return (0); +#elif defined(__powerpc__) + Elf_Size w; + const Elf_Rela *rela; + + switch (reltype) { + case ELF_RELOC_RELA: + rela = reldata; + if (relbase + rela->r_offset >= dataaddr && + relbase + rela->r_offset < dataaddr + len) { + switch (ELF_R_TYPE(rela->r_info)) { + case R_PPC_RELATIVE: + w = relbase + rela->r_addend; + bcopy(&w, (u_char *)data + (relbase + + rela->r_offset - dataaddr), sizeof(w)); + break; + default: + printf("\nunhandled relocation type %u\n", + (u_int)ELF_R_TYPE(rela->r_info)); + return (EFTYPE); + } + } + break; + } + + return (0); #else return (EOPNOTSUPP); #endif From owner-svn-src-stable-9@FreeBSD.ORG Fri Sep 28 20:29:06 2012 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D02E2106568D; Fri, 28 Sep 2012 20:29:06 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B68CD8FC15; Fri, 28 Sep 2012 20:29:06 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8SKT6N7001997; Fri, 28 Sep 2012 20:29:06 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8SKT6wD001995; Fri, 28 Sep 2012 20:29:06 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201209282029.q8SKT6wD001995@svn.freebsd.org> From: Xin LI Date: Fri, 28 Sep 2012 20:29:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r241038 - stable/9/usr.sbin/mountd X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Sep 2012 20:29:07 -0000 Author: delphij Date: Fri Sep 28 20:29:06 2012 New Revision: 241038 URL: http://svn.freebsd.org/changeset/base/241038 Log: MFC r239744: Show error messages if nmount() failed. Modified: stable/9/usr.sbin/mountd/mountd.c Directory Properties: stable/9/usr.sbin/mountd/ (props changed) Modified: stable/9/usr.sbin/mountd/mountd.c ============================================================================== --- stable/9/usr.sbin/mountd/mountd.c Fri Sep 28 18:28:27 2012 (r241037) +++ stable/9/usr.sbin/mountd/mountd.c Fri Sep 28 20:29:06 2012 (r241038) @@ -2464,11 +2464,11 @@ do_mount(struct exportlist *ep, struct g } if (errno == EPERM) { if (debug) - warnx("can't change attributes for %s", - dirp); + warnx("can't change attributes for %s: %s", + dirp, errmsg); syslog(LOG_ERR, - "can't change attributes for %s", - dirp); + "can't change attributes for %s: %s", + dirp, errmsg); ret = 1; goto error_exit; }