From patchwork Mon Aug 13 11:00:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 10564073 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 602DA1057 for ; Mon, 13 Aug 2018 11:00:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5BA1928FB5 for ; Mon, 13 Aug 2018 11:00:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4EF8828FBA; Mon, 13 Aug 2018 11:00:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E236A28FB5 for ; Mon, 13 Aug 2018 11:00:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728370AbeHMNmQ (ORCPT ); Mon, 13 Aug 2018 09:42:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:37020 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728310AbeHMNmQ (ORCPT ); Mon, 13 Aug 2018 09:42:16 -0400 Received: from tleilax.poochiereds.net (cpe-71-70-156-158.nc.res.rr.com [71.70.156.158]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 403402152C; Mon, 13 Aug 2018 11:00:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1534158030; bh=pghY/dmGO1l8koea/Uvpa0p4Jrmugo33rYrxD4K9dYk=; h=Subject:From:To:Cc:Date:From; b=BDAxTR4o9gZBL/4644eZuWc6d50tKUsV9hnbfQWUtXGyajwnFUM+RBNModTBpCF4+ nRTBStzPse7CtCK8MT9vFhegnJ/BeSrJ5yXigVbRxfuklmO/lpemrmPF2ffQr1f50u wZpSl05gfXezs5I5fQHcsAW6zsumSV/RsrqjmTgk= Message-ID: Subject: [GIT PULL] file locking updates for 4.19 From: Jeff Layton To: Linus Torvalds Cc: linux-fsdevel , LKML , Konstantin Khorenko , Bruce Fields Date: Mon, 13 Aug 2018 07:00:23 -0400 X-Mailer: Evolution 3.28.5 (3.28.5-1.fc28) Mime-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The following changes since commit 2837461dbe6f4a9acc0d86f88825888109211c99: Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi (2018-06-14 16:35:32 +0900) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git tags/locks-v4.19-1 for you to fetch changes up to da33a871ba178dbe81da7d755818d3c2088cae32: locks: remove misleading obsolete comment (2018-08-08 12:59:06 -0400) ---------------------------------------------------------------- Just a couple of patches from Konstantin to fix /proc/locks when the process that set the lock has exited, and a new tracepoint for the flock() codepath. Also threw in mailmap entries for my addresses and a comment cleanup. ---------------------------------------------------------------- Jeff Layton (3): locks: add tracepoint in flock codepath mailmap: remap some of my email addresses to kernel.org address locks: remove misleading obsolete comment Konstantin Khorenko (2): fs/lock: skip lock owner pid translation in case we are in init_pid_ns fs/lock: show locks taken by processes from another pidns .mailmap | 3 +++ fs/locks.c | 20 +++++++++++--------- include/trace/events/filelock.h | 5 ++++- 3 files changed, 18 insertions(+), 10 deletions(-)