From patchwork Tue Jun 20 09:55:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stsp X-Patchwork-Id: 110405 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3558941vqr; Tue, 20 Jun 2023 03:20:12 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6J0hwCZ8G1uJHLivSd6Q6OlgA4V8Cxf9jX4vzFBZKfrzDj1YfHphIJRrNIroNFQSsHEPkl X-Received: by 2002:a17:903:48a:b0:1b5:cbc:b4c with SMTP id jj10-20020a170903048a00b001b50cbc0b4cmr11204023plb.46.1687256411729; Tue, 20 Jun 2023 03:20:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687256411; cv=none; d=google.com; s=arc-20160816; b=qMFi7PxcZPlCukmloNpaaPwWdwxKZK8/lHxpkoL0ZGWK6kCvq60fTXplzgVFgXwYv6 8cdOtstVpKJmWGYbFq01mz/XCb7OiyBKR8HXwhmbBU/Z8SkaNM/sgJx+uNtTWyvJYfYk lanSAEMx35wtI8nkc5jRWZ0P5zF1sw2Kfuvqqi3RPL8eWEz+f0H2p9Jk13jvHcqIq3TJ Gl/PHNpl6X47AeXXmQUOjTCz3NRW4u/Sqz4ZxfVcxw4+V1YvSorzKld93DHOKBegLj2W DGr5vs6BTc6ZgueSwm+Cba5bR/s8LoozqtdAx/+InCQsbdl9H5XKdGtesDaxGurMlZ4k tnlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=G9Y9dMrT6FQOwfuA3r+IFC4b4bwCTthKlJeujdIJm70=; b=rbIui99mlioxzIMImjB4pkoCP0zHhRIf9o4bDvcM5Y7wx10tospEvV1psURaMNFYO5 XJ+HzTmoW7RokA956HSz2ACXgnyZf7mjMEa3LwZ8Uw6oRNe0d9jME6/LLwt9juv/ENgq 7njDqGcCKYb66S80l0Dj0+JmvkqWBPs5KEAZ0ic9odHRseKhEhdGpPyw7NdgGIsgSbrt VyIBGf7qjUH2Cc5gaB3nrtlmkZopQx1MDP+atsdeGjTV0VozbdhhkdDojAH68woRpY4U W3MdM2PPuLyd+aZcbKKi+sp5+eqJiqv25DXAA0TnPcpv/DdhRevh58xQfbAZ8/EwNwrF 695g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@yandex.ru header.s=mail header.b=PywmBlbr; 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=yandex.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d11-20020a170902cecb00b001afcd047456si1738747plg.636.2023.06.20.03.19.56; Tue, 20 Jun 2023 03:20:11 -0700 (PDT) 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=@yandex.ru header.s=mail header.b=PywmBlbr; 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=yandex.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231391AbjFTKD1 (ORCPT + 99 others); Tue, 20 Jun 2023 06:03:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230451AbjFTKDC (ORCPT ); Tue, 20 Jun 2023 06:03:02 -0400 X-Greylist: delayed 62 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Tue, 20 Jun 2023 03:02:14 PDT Received: from forward202a.mail.yandex.net (forward202a.mail.yandex.net [178.154.239.91]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E2A9F1707; Tue, 20 Jun 2023 03:02:13 -0700 (PDT) Received: from forward102a.mail.yandex.net (forward102a.mail.yandex.net [IPv6:2a02:6b8:c0e:500:1:45:d181:d102]) by forward202a.mail.yandex.net (Yandex) with ESMTP id C02DB494FC; Tue, 20 Jun 2023 12:56:05 +0300 (MSK) Received: from mail-nwsmtp-smtp-production-main-51.vla.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-51.vla.yp-c.yandex.net [IPv6:2a02:6b8:c1f:5e51:0:640:23ee:0]) by forward102a.mail.yandex.net (Yandex) with ESMTP id 3E99F46D20; Tue, 20 Jun 2023 12:55:53 +0300 (MSK) Received: by mail-nwsmtp-smtp-production-main-51.vla.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id Utd7jIuDca60-1Wx2nAVR; Tue, 20 Jun 2023 12:55:51 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1687254951; bh=G9Y9dMrT6FQOwfuA3r+IFC4b4bwCTthKlJeujdIJm70=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=PywmBlbr/auoIhmihGCTALiqPbeNVDX47HbGdTQz2kcwFNI9qdjQUtsQOwZ41xlDp iMx5cWAXXgslcT0ETY8F+nu9XmzyTPXXiMrHXoSQ+Xm6/+IBFSixtk39mwvpkNEceO i7sTeRVDWP1vCoPVtbwqRotHm0Zm1Ztirjs8DTpw= Authentication-Results: mail-nwsmtp-smtp-production-main-51.vla.yp-c.yandex.net; dkim=pass header.i=@yandex.ru From: Stas Sergeev To: linux-kernel@vger.kernel.org Cc: Stas Sergeev , Jeff Layton , Chuck Lever , Alexander Viro , Christian Brauner , linux-fsdevel@vger.kernel.org Subject: [PATCH 2/3] fd/locks: allow get the lock owner by F_OFD_GETLK Date: Tue, 20 Jun 2023 14:55:06 +0500 Message-Id: <20230620095507.2677463-3-stsp2@yandex.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230620095507.2677463-1-stsp2@yandex.ru> References: <20230620095507.2677463-1-stsp2@yandex.ru> MIME-Version: 1.0 X-Spam-Status: No, score=-0.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,RCVD_IN_VALIDITY_RPBL,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no 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?1769216579190852474?= X-GMAIL-MSGID: =?utf-8?q?1769216579190852474?= Currently F_OFD_GETLK sets the pid of the lock owner to -1. Remove such behavior to allow getting the proper owner's pid. This may be helpful when you want to send some message (like SIGKILL) to the offending locker. Signed-off-by: Stas Sergeev CC: Jeff Layton CC: Chuck Lever CC: Alexander Viro CC: Christian Brauner CC: linux-fsdevel@vger.kernel.org CC: linux-kernel@vger.kernel.org --- fs/locks.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/fs/locks.c b/fs/locks.c index 210766007e63..ee265e166542 100644 --- a/fs/locks.c +++ b/fs/locks.c @@ -2158,8 +2158,6 @@ static pid_t locks_translate_pid(struct file_lock *fl, struct pid_namespace *ns) pid_t vnr; struct pid *pid; - if (IS_OFDLCK(fl)) - return -1; if (IS_REMOTELCK(fl)) return fl->fl_pid; /*