From patchwork Wed Dec 23 02:01:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 41528 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8A9AF3833039; Wed, 23 Dec 2020 02:01:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8A9AF3833039 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1608688883; bh=8Wlagu+HjvFhtiLzhXIuckxb3o15UZ+63/QYwNvP/nw=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=Jgapakcye0+3gIU450Qac9o95hryjAXRckwwTIxjOcRcbVht/9AvXFKPR+GKeqniX c+muxxMFz8X3v4ggnmtRGMzTKJQFhrPFZEwUWBPBIODoCL6ksDGzkgk0g0OMAK5PIB i484dTF1f8lToGAkxzG/uWI/c6qBm4ikK1BJ/BQw= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from beige.elm.relay.mailchannels.net (beige.elm.relay.mailchannels.net [23.83.212.16]) by sourceware.org (Postfix) with ESMTPS id D4AC538350A5 for ; Wed, 23 Dec 2020 02:01:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D4AC538350A5 X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id ED6BF342C7C; Wed, 23 Dec 2020 02:01:19 +0000 (UTC) Received: from pdx1-sub0-mail-a1.g.dreamhost.com (100-98-64-116.trex.outbound.svc.cluster.local [100.98.64.116]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 5F38D342346; Wed, 23 Dec 2020 02:01:19 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from pdx1-sub0-mail-a1.g.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384) by 0.0.0.0:2500 (trex/5.18.11); Wed, 23 Dec 2020 02:01:19 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Battle-Celery: 0f8fbe2a2fda9f2f_1608688879675_3315860641 X-MC-Loop-Signature: 1608688879675:125761599 X-MC-Ingress-Time: 1608688879675 Received: from pdx1-sub0-mail-a1.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a1.g.dreamhost.com (Postfix) with ESMTP id 1960C7F0A0; Tue, 22 Dec 2020 18:01:19 -0800 (PST) Received: from rhbox.intra.reserved-bit.com (unknown [1.186.101.110]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a1.g.dreamhost.com (Postfix) with ESMTPSA id 1C2237F0A3; Tue, 22 Dec 2020 18:01:15 -0800 (PST) X-DH-BACKEND: pdx1-sub0-mail-a1 To: libc-alpha@sourceware.org Subject: [COMMITTED] misc: Use __ferror_unlocked instead of ferror Date: Wed, 23 Dec 2020 07:31:07 +0530 Message-Id: <20201223020107.1232629-1-siddhesh@sourceware.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <87pn31seis.fsf@oldenburg2.str.redhat.com> References: <87pn31seis.fsf@oldenburg2.str.redhat.com> MIME-Version: 1.0 X-Spam-Status: No, score=-9.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_NONE, KAM_DMARC_STATUS, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NEUTRAL, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Siddhesh Poyarekar via Libc-alpha From: Siddhesh Poyarekar Reply-To: Siddhesh Poyarekar Cc: fweimer@redhat.com Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" The ferror results in an unnecessary PLT reference. Use __ferror_unlocked instead , which gets inlined. --- misc/mntent_r.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/mntent_r.c b/misc/mntent_r.c index 39fa08f2c6..b963c9af61 100644 --- a/misc/mntent_r.c +++ b/misc/mntent_r.c @@ -253,7 +253,7 @@ __addmntent (FILE *stream, const struct mntent *mnt) write_string (stream, mnt->mnt_opts); fprintf (stream, "%d %d\n", mnt->mnt_freq, mnt->mnt_passno); - ret = ferror (stream) != 0 || fflush (stream) != 0; + ret = __ferror_unlocked (stream) != 0 || fflush (stream) != 0; funlockfile (stream);