[PC-BSD Commits] [pcbsd/freebsd] 31dfa3: Reintegrate r250907 (previously reverted as r25475...

GitHub noreply at github.com
Wed Sep 11 05:22:42 PDT 2013


  Branch: refs/heads/releng/9.2
  Home:   https://github.com/pcbsd/freebsd
  Commit: 31dfa387f095600235048f024f8c194a670fc0f7
      https://github.com/pcbsd/freebsd/commit/31dfa387f095600235048f024f8c194a670fc0f7
  Author: gjb <gjb at FreeBSD.org>
  Date:   2013-09-10 (Tue, 10 Sep 2013)

  Changed paths:
    M sys/kern/uipc_syscalls.c

  Log Message:
  -----------
  Reintegrate r250907 (previously reverted as r254754) plus MFS r254947,
r255443:

r250907 (scottl):
  MFC r248830, r250027, r250409: Several fixes and improvements
  to sendfile()

r254947 (kib):
  NFS implementation of VOP_READ() sometimes upgrades the vnode lock,
  which causes drop of the shared lock and sleep for exclusive.  As
  result, busying of the page before the call to vn_rdwr() makes NFS
  code to wait for vnode lock while page is busy, which contradicts the
  proper order of vnode lock -> busy.

r255443 (des):
  Fix the length calculation for the final block of a sendfile(2)
  transmission which could be tricked into rounding up to the nearest
  page size, leaking up to a page of kernel memory.  [13:11]

Approved by:	re (delphij)
Sponsored by:	The FreeBSD Foundation


  Commit: 750678af7b50371940a52788655d6321aedd828a
      https://github.com/pcbsd/freebsd/commit/750678af7b50371940a52788655d6321aedd828a
  Author: gjb <gjb at FreeBSD.org>
  Date:   2013-09-10 (Tue, 10 Sep 2013)

  Changed paths:
    M release/Makefile.sysinstall
    M sys/conf/newvers.sh

  Log Message:
  -----------
  Update releng/9.2 to -RC4.

Approved by:	re (implicit)


  Commit: dbc5b95d56ac9aaacd06fb7f66c4a5a38770f5af
      https://github.com/pcbsd/freebsd/commit/dbc5b95d56ac9aaacd06fb7f66c4a5a38770f5af
  Author: Kris Moore <kris at pcbsd.org>
  Date:   2013-09-11 (Wed, 11 Sep 2013)

  Changed paths:
    M release/Makefile.sysinstall
    M sys/conf/newvers.sh
    M sys/kern/uipc_syscalls.c

  Log Message:
  -----------
  Merge branch 'releng/9.2' of https://github.com/freebsd/freebsd into releng/9.2

This brings us up to RC4

Conflicts:
	sys/conf/newvers.sh


Compare: https://github.com/pcbsd/freebsd/compare/05ca0e51a923...dbc5b95d56ac


More information about the Commits mailing list