From owner-svn-src-head@freebsd.org Wed Jan 29 01:52:28 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1241A1B2186; Wed, 29 Jan 2020 01:52:28 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 486mhC6mnLz3x2H; Wed, 29 Jan 2020 01:52:27 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E3EFD4AEF; Wed, 29 Jan 2020 01:52:27 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00T1qRiZ090236; Wed, 29 Jan 2020 01:52:27 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00T1qRfT090235; Wed, 29 Jan 2020 01:52:27 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202001290152.00T1qRfT090235@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Wed, 29 Jan 2020 01:52:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r357238 - head/lib/libc/gen X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/lib/libc/gen X-SVN-Commit-Revision: 357238 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jan 2020 01:52:28 -0000 Author: mjg Date: Wed Jan 29 01:52:27 2020 New Revision: 357238 URL: https://svnweb.freebsd.org/changeset/base/357238 Log: libc: remove forward compat added in r356830 for F_ISUNIONSTACK Modified: head/lib/libc/gen/opendir.c Modified: head/lib/libc/gen/opendir.c ============================================================================== --- head/lib/libc/gen/opendir.c Wed Jan 29 01:51:21 2020 (r357237) +++ head/lib/libc/gen/opendir.c Wed Jan 29 01:52:27 2020 (r357238) @@ -35,8 +35,6 @@ __FBSDID("$FreeBSD$"); #include "namespace.h" #include -#include -#include #include #include @@ -276,7 +274,6 @@ _filldir(DIR *dirp, bool use_current_pos) static bool is_unionstack(int fd) { - struct statfs sfb; int unionstack; unionstack = _fcntl(fd, F_ISUNIONSTACK, 0); @@ -284,12 +281,10 @@ is_unionstack(int fd) return (unionstack); /* - * Temporary compat for kernels which don't provide F_ISUNIONSTACK. + * Should not happen unless running on a kernel without the op, + * but no use rendering the system useless in such a case. */ - if (_fstatfs(fd, &sfb) < 0) - return (true); - return (strcmp(sfb.f_fstypename, "unionfs") == 0 || - (sfb.f_flags & MNT_UNION)); + return (0); } /*