From owner-svn-src-stable-10@FreeBSD.ORG Sun Jul 6 22:51:54 2014 Return-Path: Delivered-To: svn-src-stable-10@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 ESMTPS id 3F37F866; Sun, 6 Jul 2014 22:51:54 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2C0D22D98; Sun, 6 Jul 2014 22:51:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s66MpsiP072547; Sun, 6 Jul 2014 22:51:54 GMT (envelope-from mjg@svn.freebsd.org) Received: (from mjg@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s66Mpsol072546; Sun, 6 Jul 2014 22:51:54 GMT (envelope-from mjg@svn.freebsd.org) Message-Id: <201407062251.s66Mpsol072546@svn.freebsd.org> From: Mateusz Guzik Date: Sun, 6 Jul 2014 22:51:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r268337 - stable/10/sys/kern X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jul 2014 22:51:54 -0000 Author: mjg Date: Sun Jul 6 22:51:53 2014 New Revision: 268337 URL: http://svnweb.freebsd.org/changeset/base/268337 Log: MFC r267708: do_dup: plug redundant adjustment of fd_lastfile By that time it was already set by fdalloc, or was there in the first place if fd is replaced. Modified: stable/10/sys/kern/kern_descrip.c Modified: stable/10/sys/kern/kern_descrip.c ============================================================================== --- stable/10/sys/kern/kern_descrip.c Sun Jul 6 22:49:07 2014 (r268336) +++ stable/10/sys/kern/kern_descrip.c Sun Jul 6 22:51:53 2014 (r268337) @@ -886,8 +886,6 @@ do_dup(struct thread *td, int flags, int newfde->fde_flags = oldfde->fde_flags | UF_EXCLOSE; else newfde->fde_flags = oldfde->fde_flags & ~UF_EXCLOSE; - if (new > fdp->fd_lastfile) - fdp->fd_lastfile = new; *retval = new; if (delfp != NULL) {