From owner-p4-projects@FreeBSD.ORG  Thu Jan 18 10:16:12 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 95C7C16A416; Thu, 18 Jan 2007 10:16:12 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5B87A16A407
	for <perforce@FreeBSD.org>; Thu, 18 Jan 2007 10:16:12 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 4CA7C13C442
	for <perforce@FreeBSD.org>; Thu, 18 Jan 2007 10:16:12 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l0IAGCUJ033196
	for <perforce@FreeBSD.org>; Thu, 18 Jan 2007 10:16:12 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0IAGB2s033193
	for perforce@freebsd.org; Thu, 18 Jan 2007 10:16:11 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Thu, 18 Jan 2007 10:16:11 GMT
Message-Id: <200701181016.l0IAGB2s033193@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rdivacky@FreeBSD.org using -f
From: Roman Divacky <rdivacky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 113102 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Jan 2007 10:16:12 -0000

http://perforce.freebsd.org/chv.cgi?CH=113102

Change 113102 by rdivacky@rdivacky_witten on 2007/01/18 10:15:16

	Fix mismerge by IFC

Affected files ...

.. //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#12 edit

Differences ...

==== //depot/projects/linuxolator/src/sys/compat/linux/linux_file.c#12 (text+ko) ====

@@ -120,9 +120,9 @@
 	bsd_flags |= O_EXCL;
     if (l_flags & LINUX_O_NOCTTY)
 	bsd_flags |= O_NOCTTY;
-    if (args->flags & LINUX_O_DIRECT)
+    if (l_flags & LINUX_O_DIRECT)
 	bsd_flags |= O_DIRECT;
-    if (args->flags & LINUX_O_NOFOLLOW)
+    if (l_flags & LINUX_O_NOFOLLOW)
 	bsd_flags |= O_NOFOLLOW;
     /* XXX LINUX_O_NOATIME: unable to be easily implemented. */
 
@@ -149,7 +149,7 @@
 			    PROC_UNLOCK(p);
 			    sx_sunlock(&proctree_lock);
 		    }
-		    if (args->flags & LINUX_O_DIRECTORY) {
+		    if (l_flags & LINUX_O_DIRECTORY) {
 			    if (fp->f_type != DTYPE_VNODE ||
 				fp->f_vnode->v_type != VDIR) {
 				    error = ENOTDIR;