From owner-svn-src-user@FreeBSD.ORG  Tue Jan 12 14:43:35 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 75812106566C;
	Tue, 12 Jan 2010 14:43:35 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 64BFB8FC0A;
	Tue, 12 Jan 2010 14:43:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0CEhZLW015226;
	Tue, 12 Jan 2010 14:43:35 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0CEhZ9i015225;
	Tue, 12 Jan 2010 14:43:35 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201001121443.o0CEhZ9i015225@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Tue, 12 Jan 2010 14:43:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r202152 - user/ed/utmpx/lib/libc/gen
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Tue, 12 Jan 2010 14:43:35 -0000

Author: ed
Date: Tue Jan 12 14:43:34 2010
New Revision: 202152
URL: http://svn.freebsd.org/changeset/base/202152

Log:
  According to lockf(3):
  
  	File locks are released on first close by the locking process of
  	any file descriptor for the file.
  
  No need to call it then.

Modified:
  user/ed/utmpx/lib/libc/gen/pututxline.c

Modified: user/ed/utmpx/lib/libc/gen/pututxline.c
==============================================================================
--- user/ed/utmpx/lib/libc/gen/pututxline.c	Tue Jan 12 13:45:40 2010	(r202151)
+++ user/ed/utmpx/lib/libc/gen/pututxline.c	Tue Jan 12 14:43:34 2010	(r202152)
@@ -104,7 +104,6 @@ utx_active_add(const struct futx *fu)
 		lseek(fd, partial, SEEK_SET);
 exact:
 	_write(fd, fu, sizeof *fu);
-	lockf(fd, F_ULOCK, 0);
 	_close(fd);
 }
 
@@ -142,13 +141,11 @@ utx_active_remove(struct futx *fu)
 			/* Terminate session. */
 			lseek(fd, -sizeof fe, SEEK_CUR);
 			_write(fd, fu, sizeof *fu);
-			lockf(fd, F_ULOCK, 0);
 			_close(fd);
 			return (0);
 		}
 	}
 
-	lockf(fd, F_ULOCK, 0);
 	_close(fd);
 	return (1);
 }
@@ -192,7 +189,6 @@ utx_lastlogin_add(const struct futx *fu)
 	}
 	_write(fd, fu, sizeof *fu);
 done:
-	lockf(fd, F_ULOCK, 0);
 	_close(fd);
 }