From patchwork Tue Nov 17 11:52:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 7636691 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 589399F1D3 for ; Tue, 17 Nov 2015 11:55:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 65CFE204E2 for ; Tue, 17 Nov 2015 11:55:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5C17F204FC for ; Tue, 17 Nov 2015 11:55:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753297AbbKQLzX (ORCPT ); Tue, 17 Nov 2015 06:55:23 -0500 Received: from mail-qk0-f176.google.com ([209.85.220.176]:34179 "EHLO mail-qk0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753200AbbKQLxW (ORCPT ); Tue, 17 Nov 2015 06:53:22 -0500 Received: by qkfo3 with SMTP id o3so1683905qkf.1 for ; Tue, 17 Nov 2015 03:53:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poochiereds_net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XOgjFaaEeT2u0+0C3+/vVSBNJLUS30H2mOlQyPMxcBs=; b=ttXSp4z8nFinczSo2xsKprTyGY4PBl7GjnTyWkhMdh8LXBubuttEw4kCBMpmlUjt94 C04QJEZqsGJPgLZd15ixStlZyoYcaL2NAdrmddiEGwvJj3G9Px8MbztOUdHCnM8J4WMr TZ74RNp+yyzebtuWTgHcmbqZlwgL0XcK/Qo9b34BYW1C6dHK5LaZWsEz/D1lP2z/iAh8 04Z2jSw5ublBwCgeLu2/NoXyJyUwJLfBG2vEjxJTCQpAoSznNAr1Gkd+j4H1ATgnaB5C p5nNlLDjBVv42ZdsINTegSMJVS4XC7Dt4cEnOf6vaSlbwNhkx9A9ODyyvMKR/AfIYZMI cZmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XOgjFaaEeT2u0+0C3+/vVSBNJLUS30H2mOlQyPMxcBs=; b=APf+G8DoD52R/qv+OC81f/Ueo8uclEPnYFx9UEsLJ6EwuP7IWKCeEKDF0YZzUf8etL qmTGMsu74k32K6NdmTZBF8Owr1mqnRjiH+TJnQuvqY6P/XZMntb6hxCo3sRLHOwod3Pj 3zax7E3B7dXbAMsxh8iOK4VfMXkeHXznnLJ/iXmG8r+UKuPmkTAKdZF0s+e8+5yRvq6X N+UL6duozIo7uSscl3E8sCBzep5jtPRGRhMN2lvaI6JWhScyf+ndfoB4GuViUNYdSd1Y Q6H+498BBYNmtTIuaR+hQRx39urIcG+ESpQ8MGaQrot+gzLo+G3bR3u/BksHJ1a99rCr 2uzg== X-Gm-Message-State: ALoCoQnRZ2LtQBU+XWFdxF+fO3jU66hrzbqWvhMv20mnxow/a/iaUIFZyCRp6jh8Osxi4Oz2gBX+ X-Received: by 10.55.82.193 with SMTP id g184mr41796666qkb.65.1447761201726; Tue, 17 Nov 2015 03:53:21 -0800 (PST) Received: from tlielax.poochiereds.net ([2606:a000:1125:4075::d5a]) by smtp.googlemail.com with ESMTPSA id w10sm1583910qhc.16.2015.11.17.03.53.20 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 Nov 2015 03:53:21 -0800 (PST) From: Jeff Layton X-Google-Original-From: Jeff Layton To: bfields@fieldses.org, trond.myklebust@primarydata.com Cc: linux-nfs@vger.kernel.org, Eric Paris , Alexander Viro , linux-fsdevel@vger.kernel.org Subject: [PATCH v1 04/38] fs: rename "delayed_fput" infrastructure to "fput_global" Date: Tue, 17 Nov 2015 06:52:26 -0500 Message-Id: <1447761180-4250-5-git-send-email-jeff.layton@primarydata.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1447761180-4250-1-git-send-email-jeff.layton@primarydata.com> References: <1447761180-4250-1-git-send-email-jeff.layton@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP delayed_fput work is only delayed until the workqueue job runs. It's even possible that it will run immediately after you call it if the workqueue job happens to be executing at the time. What it does guarantee is that the final __fput will run in a different task than the the one that queued it. It's this property that we want to use in the NFSD code to close files in advance of a setlease attempt by userland. Change the name of the "delayed_fput" infrastructure to "fput_global" as that better describes what this code does. Cc: Al Viro Signed-off-by: Jeff Layton --- fs/file_table.c | 38 ++++++++++++++++++++------------------ include/linux/file.h | 2 +- init/main.c | 2 +- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/fs/file_table.c b/fs/file_table.c index 8cfeaee6323f..0bf8ddc680ab 100644 --- a/fs/file_table.c +++ b/fs/file_table.c @@ -227,10 +227,10 @@ static void __fput(struct file *file) mntput(mnt); } -static LLIST_HEAD(delayed_fput_list); -static void delayed_fput(struct work_struct *unused) +static LLIST_HEAD(global_fput_list); +static void global_fput(struct work_struct *unused) { - struct llist_node *node = llist_del_all(&delayed_fput_list); + struct llist_node *node = llist_del_all(&global_fput_list); struct llist_node *next; for (; node; node = next) { @@ -244,21 +244,23 @@ static void ____fput(struct callback_head *work) __fput(container_of(work, struct file, f_u.fu_rcuhead)); } -static DECLARE_DELAYED_WORK(delayed_fput_work, delayed_fput); +static DECLARE_DELAYED_WORK(global_fput_work, global_fput); -/* - * If kernel thread really needs to have the final fput() it has done - * to complete, call this. The only user right now is the boot - we - * *do* need to make sure our writes to binaries on initramfs has - * not left us with opened struct file waiting for __fput() - execve() - * won't work without that. Please, don't add more callers without - * very good reasons; in particular, never call that with locks - * held and never call that from a thread that might need to do - * some work on any kind of umount. +/** + * fput_global_flush - ensure that all global_fput work is complete + * + * If a kernel thread really needs to have the final fput() it has done to + * complete, call this. One of the main users is the boot - we *do* need to + * make sure our writes to binaries on initramfs has not left us with opened + * struct file waiting for __fput() - execve() won't work without that. + * + * Please, don't add more callers without very good reasons; in particular, + * never call that with locks held and never from a thread that might need to + * do some work on any kind of umount. */ -void flush_delayed_fput(void) +void fput_global_flush(void) { - flush_delayed_work(&delayed_fput_work); + flush_delayed_work(&global_fput_work); } /** @@ -296,15 +298,15 @@ void fput(struct file *file) */ } - if (llist_add(&file->f_u.fu_llist, &delayed_fput_list)) - schedule_delayed_work(&delayed_fput_work, 1); + if (llist_add(&file->f_u.fu_llist, &global_fput_list)) + schedule_delayed_work(&global_fput_work, 1); } } EXPORT_SYMBOL(fput); /* * synchronous analog of fput(); for kernel threads that might be needed - * in some umount() (and thus can't use flush_delayed_fput() without + * in some umount() (and thus can't use fput_global_flush() without * risking deadlocks), need to wait for completion of __fput() and know * for this specific struct file it won't involve anything that would * need them. Use only if you really need it - at the very least, diff --git a/include/linux/file.h b/include/linux/file.h index f87d30882a24..73bb7cee57e9 100644 --- a/include/linux/file.h +++ b/include/linux/file.h @@ -70,7 +70,7 @@ extern void put_unused_fd(unsigned int fd); extern void fd_install(unsigned int fd, struct file *file); -extern void flush_delayed_fput(void); +extern void fput_global_flush(void); extern void __fput_sync(struct file *); #endif /* __LINUX_FILE_H */ diff --git a/init/main.c b/init/main.c index 9e64d7097f1a..6cb24a16ddd6 100644 --- a/init/main.c +++ b/init/main.c @@ -941,7 +941,7 @@ static int __ref kernel_init(void *unused) system_state = SYSTEM_RUNNING; numa_default_policy(); - flush_delayed_fput(); + fput_global_flush(); if (ramdisk_execute_command) { ret = run_init_process(ramdisk_execute_command);