From patchwork Mon Mar 18 01:00:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Kent X-Patchwork-Id: 10856729 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 70AC017EF for ; Mon, 18 Mar 2019 01:00:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 510212914E for ; Mon, 18 Mar 2019 01:00:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4530929176; Mon, 18 Mar 2019 01:00:47 +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=-7.9 required=2.0 tests=BAYES_00,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 E3D4C29190 for ; Mon, 18 Mar 2019 01:00:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727753AbfCRBAp (ORCPT ); Sun, 17 Mar 2019 21:00:45 -0400 Received: from icp-osb-irony-out8.external.iinet.net.au ([203.59.1.225]:8677 "EHLO icp-osb-irony-out8.external.iinet.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727725AbfCRBAp (ORCPT ); Sun, 17 Mar 2019 21:00:45 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2BeAAAv7I5c/44x0HZjHgEGBwaBUQkLAYIQgTghEieEC5QJAQECAQEGgRA4iS2JXoUTgXsgGAGENgoChFAiNAkNAQEDAQEBCAEDAm0ohUsGI1YQGAEMAhgOAgJHEAYThQsMqVGBLxoCigmBCyQBiy8XeIEHgUSCKohAglcDihsbgiKELUw7X5FqCZMlGYF8iSgDiDAtgxGIYJNTOIFWTS4KgyeCQI4YNTCBBQEBjUsBAQ X-IPAS-Result: A2BeAAAv7I5c/44x0HZjHgEGBwaBUQkLAYIQgTghEieEC5QJAQECAQEGgRA4iS2JXoUTgXsgGAGENgoChFAiNAkNAQEDAQEBCAEDAm0ohUsGI1YQGAEMAhgOAgJHEAYThQsMqVGBLxoCigmBCyQBiy8XeIEHgUSCKohAglcDihsbgiKELUw7X5FqCZMlGYF8iSgDiDAtgxGIYJNTOIFWTS4KgyeCQI4YNTCBBQEBjUsBAQ X-IronPort-AV: E=Sophos;i="5.58,491,1544457600"; d="scan'208";a="206152905" Received: from unknown (HELO pluto.themaw.net) ([118.208.49.142]) by icp-osb-irony-out8.iinet.net.au with ESMTP; 18 Mar 2019 09:00:40 +0800 Subject: [PATCH 4/5] autofs - update mount control expire desription with AUTOFS_EXP_FORCED From: Ian Kent To: Andrew Morton Cc: Kernel Mailing List , autofs mailing list , linux-fsdevel Date: Mon, 18 Mar 2019 09:00:40 +0800 Message-ID: <155287084078.12593.15000931045413195778.stgit@pluto.themaw.net> In-Reply-To: <155287082394.12593.6506084453911662450.stgit@pluto.themaw.net> References: <155287082394.12593.6506084453911662450.stgit@pluto.themaw.net> User-Agent: StGit/unknown-version 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 Describe AUTOFS_EXP_FORCED in addition to AUTOFS_EXP_IMMEDIATE in the description of the AUTOFS_DEV_IOCTL_EXPIRE_CMD ioctl. Signed-off-by: Ian Kent --- Documentation/filesystems/autofs-mount-control.txt | 6 ++++-- Documentation/filesystems/autofs.txt | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Documentation/filesystems/autofs-mount-control.txt b/Documentation/filesystems/autofs-mount-control.txt index 45edad6933cc..acc02fc57993 100644 --- a/Documentation/filesystems/autofs-mount-control.txt +++ b/Documentation/filesystems/autofs-mount-control.txt @@ -354,8 +354,10 @@ this ioctl is called until no further expire candidates are found. The call requires an initialized struct autofs_dev_ioctl with the ioctlfd field set to the descriptor obtained from the open call. In -addition an immediate expire, independent of the mount timeout, can be -requested by setting the how field of struct args_expire to 1. If no +addition an immediate expire that's independent of the mount timeout, +and a forced expire that's independent of whether the mount is busy, +can be requested by setting the how field of struct args_expire to +AUTOFS_EXP_IMMEDIATE or AUTOFS_EXP_FORCED, respectively . If no expire candidates can be found the ioctl returns -1 with errno set to EAGAIN. diff --git a/Documentation/filesystems/autofs.txt b/Documentation/filesystems/autofs.txt index 8fe43c97cb96..409e6411904d 100644 --- a/Documentation/filesystems/autofs.txt +++ b/Documentation/filesystems/autofs.txt @@ -410,6 +410,11 @@ The available ioctl commands are: **AUTOFS_EXP_IMMEDIATE** causes `last_used` time to be ignored and objects are expired if the are not in use. + **AUTOFS_EXP_FORCED** causes the in use status to be ignored + and objects are expired ieven if they are in use. This assumes + that the daemon has requested this because it is capable of + performing the umount. + **AUTOFS_EXP_LEAVES** will select a leaf rather than a top-level name to expire. This is only safe when *maxproto* is 4.