From owner-svn-src-user@FreeBSD.ORG  Sat Oct 12 12:34:20 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 1917EE89;
 Sat, 12 Oct 2013 12:34:20 +0000 (UTC)
 (envelope-from dchagin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 065902B95;
 Sat, 12 Oct 2013 12:34:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9CCYJ8X095605;
 Sat, 12 Oct 2013 12:34:19 GMT (envelope-from dchagin@svn.freebsd.org)
Received: (from dchagin@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9CCYJjd095604;
 Sat, 12 Oct 2013 12:34:19 GMT (envelope-from dchagin@svn.freebsd.org)
Message-Id: <201310121234.r9CCYJjd095604@svn.freebsd.org>
From: Dmitry Chagin <dchagin@FreeBSD.org>
Date: Sat, 12 Oct 2013 12:34:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r256376 - user/dchagin/lemul/sys/amd64/linux
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 12 Oct 2013 12:34:20 -0000

Author: dchagin
Date: Sat Oct 12 12:34:19 2013
New Revision: 256376
URL: http://svnweb.freebsd.org/changeset/base/256376

Log:
  According to r255219 change the cap_rights_t type in the fget() call.

Modified:
  user/dchagin/lemul/sys/amd64/linux/linux_machdep.c

Modified: user/dchagin/lemul/sys/amd64/linux/linux_machdep.c
==============================================================================
--- user/dchagin/lemul/sys/amd64/linux/linux_machdep.c	Sat Oct 12 12:23:06 2013	(r256375)
+++ user/dchagin/lemul/sys/amd64/linux/linux_machdep.c	Sat Oct 12 12:34:19 2013	(r256376)
@@ -163,6 +163,7 @@ linux_mmap2(struct thread *td, struct li
 	} */ bsd_args;
 	int error;
 	struct file *fp;
+	cap_rights_t rights;
 
 	LINUX_CTR6(mmap2, "0x%lx, %ld, %ld, 0x%08lx, %ld, 0x%lx",
 	    args->addr, args->len, args->prot,
@@ -212,7 +213,9 @@ linux_mmap2(struct thread *td, struct li
 		 * protection options specified.
 		 */
 
-		if ((error = fget(td, bsd_args.fd, CAP_MMAP, &fp)) != 0)
+		error = fget(td, bsd_args.fd,
+		    cap_rights_init(&rights, CAP_MMAP), &fp);
+		if (error != 0 )
 			return (error);
 		if (fp->f_type != DTYPE_VNODE) {
 			fdrop(fp, td);