From patchwork Tue Jun 19 03:02:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Kent X-Patchwork-Id: 10473015 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8ABE060244 for ; Tue, 19 Jun 2018 03:03:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 84EE51FF1E for ; Tue, 19 Jun 2018 03:03:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 79BAB26D05; Tue, 19 Jun 2018 03:03:44 +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=unavailable 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 2C37E1FF1E for ; Tue, 19 Jun 2018 03:03:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S937246AbeFSDCs (ORCPT ); Mon, 18 Jun 2018 23:02:48 -0400 Received: from icp-osb-irony-out7.external.iinet.net.au ([203.59.1.107]:50367 "EHLO icp-osb-irony-out7.external.iinet.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935690AbeFSDCr (ORCPT ); Mon, 18 Jun 2018 23:02:47 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2AWEwBicShb/6c80XZcHgEGDINJgU8SK?= =?us-ascii?q?IN5lFZGAQEBAQEGgQ00kDiEKIF4HhgBhEACgl8hNhYBAgEBAQEBAQJtKIUpBiM?= =?us-ascii?q?EUhAYAQwCGA4CAkcQBhOFGAyqU4FpMxoCiC2BaIELh0mBDIEHgT+KUoJVAo0gi?= =?us-ascii?q?3YJjwmIGIUjK5JqByqBUk0uCoJ+kFwyMHoBAZBSAQE?= X-IPAS-Result: =?us-ascii?q?A2AWEwBicShb/6c80XZcHgEGDINJgU8SKIN5lFZGAQEBAQE?= =?us-ascii?q?GgQ00kDiEKIF4HhgBhEACgl8hNhYBAgEBAQEBAQJtKIUpBiMEUhAYAQwCGA4CA?= =?us-ascii?q?kcQBhOFGAyqU4FpMxoCiC2BaIELh0mBDIEHgT+KUoJVAo0gi3YJjwmIGIUjK5J?= =?us-ascii?q?qByqBUk0uCoJ+kFwyMHoBAZBSAQE?= X-IronPort-AV: E=Sophos;i="5.51,241,1526313600"; d="scan'208";a="90294669" Received: from unknown (HELO pluto.themaw.net) ([118.209.60.167]) by icp-osb-irony-out7.iinet.net.au with ESMTP; 19 Jun 2018 11:02:09 +0800 Subject: [PATCH 3/6] autofs - make autofs_expire_direct() static From: Ian Kent To: Andrew Morton Cc: linux-fsdevel , autofs mailing list , Kernel Mailing List Date: Tue, 19 Jun 2018 11:02:09 +0800 Message-ID: <152937732944.21213.11821977712410930973.stgit@pluto.themaw.net> In-Reply-To: <152937731702.21213.7371321165189170865.stgit@pluto.themaw.net> References: <152937731702.21213.7371321165189170865.stgit@pluto.themaw.net> User-Agent: StGit/0.17.1-dirty 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 autofs_expire_direct() isn't used outside of fs/autofs/expire.c so make it static. Signed-off-by: Ian Kent --- fs/autofs/autofs_i.h | 3 --- fs/autofs/expire.c | 8 ++++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/fs/autofs/autofs_i.h b/fs/autofs/autofs_i.h index 9400a9f6318a..4192f8002f89 100644 --- a/fs/autofs/autofs_i.h +++ b/fs/autofs/autofs_i.h @@ -154,9 +154,6 @@ int autofs_do_expire_multi(struct super_block *sb, struct vfsmount *mnt, struct autofs_sb_info *sbi, int when); int autofs_expire_multi(struct super_block *, struct vfsmount *, struct autofs_sb_info *, int __user *); -struct dentry *autofs_expire_direct(struct super_block *sb, - struct vfsmount *mnt, - struct autofs_sb_info *sbi, int how); struct dentry *autofs_expire_indirect(struct super_block *sb, struct vfsmount *mnt, struct autofs_sb_info *sbi, int how); diff --git a/fs/autofs/expire.c b/fs/autofs/expire.c index 41855cdc5630..64e6eba2c628 100644 --- a/fs/autofs/expire.c +++ b/fs/autofs/expire.c @@ -292,10 +292,10 @@ static struct dentry *autofs_check_leaves(struct vfsmount *mnt, } /* Check if we can expire a direct mount (possibly a tree) */ -struct dentry *autofs_expire_direct(struct super_block *sb, - struct vfsmount *mnt, - struct autofs_sb_info *sbi, - int how) +static struct dentry *autofs_expire_direct(struct super_block *sb, + struct vfsmount *mnt, + struct autofs_sb_info *sbi, + int how) { unsigned long timeout; struct dentry *root = dget(sb->s_root);