From patchwork Fri Mar 10 21:27:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Viro X-Patchwork-Id: 67710 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1109133wrd; Fri, 10 Mar 2023 13:31:37 -0800 (PST) X-Google-Smtp-Source: AK7set/mODSXml3PVy5e7jL9L9lzpK+f89uEX8oxgWuDA34mzz+Z55lx4/UehfRk2sEUX0An/qf3 X-Received: by 2002:a17:902:ecd2:b0:194:5c63:364c with SMTP id a18-20020a170902ecd200b001945c63364cmr33929161plh.62.1678483897029; Fri, 10 Mar 2023 13:31:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678483897; cv=none; d=google.com; s=arc-20160816; b=S9oA05I+YllO4/38HBRrXuXWKQG5cD+Y2MYDPE3h97HawJBpOC0CAiUIkm28osaP3E vv7e1JVN2bEROfdNF5RuXN0D1pnb9F1s9oX7e4bvIQroyUYnPkyCUiH+27HuCzvIgiDG uSZj3wexXbqaONYUYMDR87oMH06TpEiu55rF+eL+TfITTIs4F+EqWuReV/rOQk1f2m38 n+nudGcYExz9RZt+d0YgHCOgqt70kThkXwvVkWW1DP2K3CHdHbnTlbSXqU2Pw0Qa5517 nGlpoLcuxjncPFUJxFmbMI8fw+bcrbJbhiMRshHmKsGs+n8XTIoTkkZXe8LkQdQX22rY fFpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=VA7GQANYVnARyMnplWzRqBTUEotzK+8D+MrS+L6xGWk=; b=a6dRXnaAh3UKn1x8Y0Xpzj02arI58Z4rApDYRdqE32BCFQvc4sBbgmBcnM4X18biAH 34VvTbFgTEs/WjDO0sU5/VmVRH3+Fm3AXMUWMnqPihDRFzFMN4DhISjhghG+tkMTGND2 iZbkJpmY0UCDAmYzzADVQejHgMI08rNg9R8kHFLe3gLU967alFjPIKtrflR9Q/faU9WA ebJpgAAOyKH3lrBx0q/3gJfyA5r2sOv2HV/zGweJ6HTWpsW49AeZVtSVFDfVAhz/jkmE Qfx/JnB+g4RpTJDykF0OhZ0+55otfaYfCXAWYZMEyA5yJNVHelNQuFlj5dCU64Rfl5Fv HWow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linux.org.uk header.s=zeniv-20220401 header.b=SYPSSuPs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=zeniv.linux.org.uk Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h6-20020a170902704600b00192c4055e78si756132plt.544.2023.03.10.13.31.01; Fri, 10 Mar 2023 13:31:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linux.org.uk header.s=zeniv-20220401 header.b=SYPSSuPs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=zeniv.linux.org.uk Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231910AbjCJV2U (ORCPT + 99 others); Fri, 10 Mar 2023 16:28:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231755AbjCJV1w (ORCPT ); Fri, 10 Mar 2023 16:27:52 -0500 Received: from zeniv.linux.org.uk (zeniv.linux.org.uk [IPv6:2a03:a000:7:0:5054:ff:fe1c:15ff]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7F1C13D50; Fri, 10 Mar 2023 13:27:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=linux.org.uk; s=zeniv-20220401; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=VA7GQANYVnARyMnplWzRqBTUEotzK+8D+MrS+L6xGWk=; b=SYPSSuPsfU1Id8eJY7beRwxxKy dyYY8mpnRVuhmIth5N53JBf5R6SSA/nwpDgR789CzCo4024lcvhn0S/6WMJOqjRMxLuuIDtw/ow5X mobHTNTGiCW+0ESucvxLq7xjZm/tl2fIBXutWkJTr4sKiuR9stLD4Ofua4wXdumF9aJ8DH+8wYy+V C/HPCrcsrG6qEfl+k+6fVLw64EEwDgSnXpBriPneC5I+OOMbIaNbfWBK8IkU+57wMIliACnEJs6Jo /1Yruu4MEImZXk9+38JL3BLwMSgfa72yV26OEmSFDePC98WihNkqvQEOkfkajmuN1UQW+jzUgkqjK vG3DlGTQ==; Received: from viro by zeniv.linux.org.uk with local (Exim 4.96 #2 (Red Hat Linux)) id 1pakHG-00FR6M-0h; Fri, 10 Mar 2023 21:27:50 +0000 From: Al Viro To: linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org Subject: [PATCH 7/8] cgroup_get_from_fd(): switch to fdget_raw() Date: Fri, 10 Mar 2023 21:27:47 +0000 Message-Id: <20230310212748.3679076-7-viro@zeniv.linux.org.uk> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230310212748.3679076-1-viro@zeniv.linux.org.uk> References: <20230310212536.GX3390869@ZenIV> <20230310212748.3679076-1-viro@zeniv.linux.org.uk> MIME-Version: 1.0 Sender: Al Viro X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760017930758568832?= X-GMAIL-MSGID: =?utf-8?q?1760017930758568832?= Signed-off-by: Al Viro --- kernel/cgroup/cgroup.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index 935e8121b21e..4b249f81c693 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -6856,14 +6856,12 @@ EXPORT_SYMBOL_GPL(cgroup_get_from_path); struct cgroup *cgroup_v1v2_get_from_fd(int fd) { struct cgroup *cgrp; - struct file *f; - - f = fget_raw(fd); - if (!f) + struct fd f = fdget_raw(fd); + if (!f.file) return ERR_PTR(-EBADF); - cgrp = cgroup_v1v2_get_from_file(f); - fput(f); + cgrp = cgroup_v1v2_get_from_file(f.file); + fdput(f); return cgrp; }