From owner-p4-projects@FreeBSD.ORG  Thu Jun 28 10:48:50 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 D0ECA16A468; Thu, 28 Jun 2007 10:48:49 +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 7942316A41F
	for <perforce@FreeBSD.org>; Thu, 28 Jun 2007 10:48:49 +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 69EE113C484
	for <perforce@FreeBSD.org>; Thu, 28 Jun 2007 10:48:49 +0000 (UTC)
	(envelope-from rdivacky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5SAmn3e037250
	for <perforce@FreeBSD.org>; Thu, 28 Jun 2007 10:48:49 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5SAmnUc037247
	for perforce@freebsd.org; Thu, 28 Jun 2007 10:48:49 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Thu, 28 Jun 2007 10:48:49 GMT
Message-Id: <200706281048.l5SAmnUc037247@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 122469 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, 28 Jun 2007 10:48:50 -0000

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

Change 122469 by rdivacky@rdivacky_witten on 2007/06/28 10:48:34

	Use the linux inconsistency only when unlinking a file.
	
	Pointed out by: rwatson

Affected files ...

.. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#16 edit

Differences ...

==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#16 (text+ko) ====

@@ -648,7 +648,7 @@
 		error = kern_rmdirat(td, dfd, path, UIO_SYSSPACE);
 	else
 		error = kern_unlinkat(td, dfd, path, UIO_SYSSPACE);
-	if (error == EPERM)
+	if (error == EPERM && !(args->flag & LINUX_AT_REMOVEDIR))
 		/* Introduce POSIX noncompliant behaviour of Linux */
 		if (kern_statat(td, dfd, path, UIO_SYSSPACE, &st) == 0)
 			if (S_ISDIR(st.st_mode))