From owner-p4-projects@FreeBSD.ORG  Sun Jun  3 11:10:11 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 E514316A469; Sun,  3 Jun 2007 11:10:10 +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 B42C816A400
	for <perforce@FreeBSD.org>; Sun,  3 Jun 2007 11:10:10 +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 A500A13C455
	for <perforce@FreeBSD.org>; Sun,  3 Jun 2007 11:10:10 +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 l53BAAd8030014
	for <perforce@FreeBSD.org>; Sun, 3 Jun 2007 11:10:10 GMT
	(envelope-from rdivacky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l53BAAHU030007
	for perforce@freebsd.org; Sun, 3 Jun 2007 11:10:10 GMT
	(envelope-from rdivacky@FreeBSD.org)
Date: Sun, 3 Jun 2007 11:10:10 GMT
Message-Id: <200706031110.l53BAAHU030007@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 120832 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: Sun, 03 Jun 2007 11:10:11 -0000

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

Change 120832 by rdivacky@rdivacky_witten on 2007/06/03 11:10:04

	Implement linux_fstatat64 using kern_[l]statat.
	
	Suggested by: rwatson

Affected files ...

.. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_stats.c#5 edit

Differences ...

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

@@ -579,35 +579,21 @@
 	return (error);
 }
 
-/* XXX: racy? */
 int
 linux_fstatat64(struct thread *td, struct linux_fstatat64_args *args)
 {
-	int error;
-	char *path, *newpath;
-	int fd, dfd, flags = O_RDONLY;
+	char *path;
+	int error, dfd;
 	struct stat buf;
 
 	if (args->flag & ~LINUX_AT_SYMLINK_NOFOLLOW)
 		return (EINVAL);
 
-	if (args->flag & LINUX_AT_SYMLINK_NOFOLLOW)
-		flags |= O_NOFOLLOW;		
+	LCONVPATHEXIST(td, args->filename, &path);
 
-	/* open the file */
-	path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);
-	error = copyinstr(args->pathname, path, MAXPATHLEN, NULL);
-	if (error) {
-		free(path, M_TEMP);
-		return (EFAULT);
-	}
-
-	LCONVPATH_SEG(td, path, &newpath, 0, UIO_SYSSPACE);
-	free(path, M_TEMP);
-
 #ifdef DEBUG
 	if (ldebug(fstatat64))
-		printf(ARGS(fstatat64, "%i, %s, %i"), args->dfd, newpath, args->flag);
+		printf(ARGS(fstatat64, "%i, %s, %i"), args->dfd, args->path, args->flag);
 #endif
 
 	if (args->dfd == LINUX_AT_FDCWD)
@@ -615,26 +601,17 @@
 	else
 		dfd = args->dfd;
 
-	error = kern_openat(td, newpath, UIO_SYSSPACE, flags, 0, dfd);
-	if (error) {
-		LFREEPATH(newpath);
-		return (error);
-	}
-	/* file opened */
-	fd = td->td_retval[0];
-	td->td_retval[0] = 0;
-
-	/* do the actual fstat */
-
-	error = kern_fstat(td, fd, &buf);
+	if (args->flags & LINUX_AT_SYMLINK_NOFOLLOW)
+		error = kern_statat(td, fd, &buf, dfd);
+	else
+		error = kern_lstatat(td, fd, &buf, dfd);
+		
 	translate_fd_major_minor(td, fd, &buf);
 	if (!error)
 		error = stat64_copyout(&buf, args->statbuf);
+	LFREEPATH(path);
 	
-	/* close the opened file */
-	kern_close(td, fd);
-	LFREEPATH(newpath);
-	return (0);
+	return (error);
 }
 
 #endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */