From patchwork Tue Mar 14 11:45:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Campos X-Patchwork-Id: 13174145 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E5A9C74A44 for ; Tue, 14 Mar 2023 11:46:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230374AbjCNLqU (ORCPT ); Tue, 14 Mar 2023 07:46:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229558AbjCNLqO (ORCPT ); Tue, 14 Mar 2023 07:46:14 -0400 Received: from alerce.blitiri.com.ar (alerce.blitiri.com.ar [IPv6:2001:bc8:228b:9000::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C399589F1F for ; Tue, 14 Mar 2023 04:45:39 -0700 (PDT) Received: from localhost.localdomain by sdfg.com.ar (chasquid) with ESMTPSA tls TLS_AES_128_GCM_SHA256 (over submission, TLS-1.3, envelope from "rodrigo@sdfg.com.ar") ; Tue, 14 Mar 2023 11:45:35 +0000 From: Rodrigo Campos To: fstests@vger.kernel.org Cc: Christian Brauner , Giuseppe Scrivano , Rodrigo Campos Subject: [PATCH v4 1/9] vfs: Don't open-code safe_close() Date: Tue, 14 Mar 2023 12:45:03 +0100 Message-Id: <20230314114511.128207-2-rodrigo@sdfg.com.ar> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230314114511.128207-1-rodrigo@sdfg.com.ar> References: <20230314114511.128207-1-rodrigo@sdfg.com.ar> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org Signed-off-by: Rodrigo Campos Reviewed-by: Christian Brauner --- src/vfs/utils.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git src/vfs/utils.c src/vfs/utils.c index 8b000506..ea7536c1 100644 --- src/vfs/utils.c +++ src/vfs/utils.c @@ -129,10 +129,8 @@ static int write_id_mapping(idmap_type_t map_type, pid_t pid, const char *buf, s fret = 0; out: - if (fd >= 0) - close(fd); - if (setgroups_fd >= 0) - close(setgroups_fd); + safe_close(fd); + safe_close(setgroups_fd); return fret; }