From owner-cvs-src@FreeBSD.ORG Mon Sep 22 20:20:06 2008 Return-Path: Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1900E1065691; Mon, 22 Sep 2008 20:20:06 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 052DE8FC1C; Mon, 22 Sep 2008 20:20:06 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8MKK5tr012268; Mon, 22 Sep 2008 20:20:05 GMT (envelope-from rdivacky@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8MKK5Ht012267; Mon, 22 Sep 2008 20:20:05 GMT (envelope-from rdivacky@repoman.freebsd.org) Message-Id: <200809222020.m8MKK5Ht012267@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to rdivacky@repoman.freebsd.org using -f From: Roman Divacky Date: Mon, 22 Sep 2008 20:19:54 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_7 Cc: Subject: cvs commit: src/sys/compat/linux linux_file.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Sep 2008 20:20:06 -0000 rdivacky 2008-09-22 20:19:54 UTC FreeBSD src repository Modified files: (Branch: RELENG_7) sys/compat/linux linux_file.c Log: SVN rev 183278 on 2008-09-22 20:19:54Z by rdivacky Merge r182892 from head to stable/7, I had to manually change the code to include "thread" argument to the vn_lock() which got removed in HEAD: Getdents requires padding with 2 bytes instead of 1 byte as with getdents64. The last byte is used for storing the d_type, add this to plain getdents case where it was missing before. Also change the code to use strlcpy instead of plain strcpy. This changes fix the getdents crash we had reports about (hl2 server etc.) PR: kern/117010 MFC after: 1 week Submitted by: Dmitry Chagin (dchagin@) Tested by: MITA Yoshio Approved by: kib (mentor) Approved by: re (kensmith) Revision Changes Path 1.105.2.3 +54 -33 src/sys/compat/linux/linux_file.c