From: Christoph Hellwig <hch@infradead.org>
To: viro@zeniv.linux.org.uk
Cc: eparis@redhat.com, linux-fsdevel@vger.kernel.org
Subject: [PATCH 02/10] fs: simplify __d_free
Date: Sun, 10 Oct 2010 05:36:22 -0400 [thread overview]
Message-ID: <20101010093720.562471644@canuck.infradead.org> (raw)
In-Reply-To: 20101010093620.416498597@canuck.infradead.org
[-- Attachment #1: cleanup-d_free --]
[-- Type: text/plain, Size: 1348 bytes --]
Remove d_callback and always call __d_free with a RCU head.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Index: linux-2.6/fs/dcache.c
===================================================================
--- linux-2.6.orig/fs/dcache.c 2010-10-09 10:20:46.650004474 +0200
+++ linux-2.6/fs/dcache.c 2010-10-09 10:24:36.806004683 +0200
@@ -67,20 +67,16 @@ struct dentry_stat_t dentry_stat = {
.age_limit = 45,
};
-static void __d_free(struct dentry *dentry)
+static void __d_free(struct rcu_head *head)
{
+ struct dentry *dentry = container_of(head, struct dentry, d_u.d_rcu);
+
WARN_ON(!list_empty(&dentry->d_alias));
if (dname_external(dentry))
kfree(dentry->d_name.name);
kmem_cache_free(dentry_cache, dentry);
}
-static void d_callback(struct rcu_head *head)
-{
- struct dentry * dentry = container_of(head, struct dentry, d_u.d_rcu);
- __d_free(dentry);
-}
-
/*
* no dcache_lock, please. The caller must decrement dentry_stat.nr_dentry
* inside dcache_lock.
@@ -91,9 +87,9 @@ static void d_free(struct dentry *dentry
dentry->d_op->d_release(dentry);
/* if dentry was never inserted into hash, immediate free is OK */
if (hlist_unhashed(&dentry->d_hash))
- __d_free(dentry);
+ __d_free(&dentry->d_u.d_rcu);
else
- call_rcu(&dentry->d_u.d_rcu, d_callback);
+ call_rcu(&dentry->d_u.d_rcu, __d_free);
}
/*
next prev parent reply other threads:[~2010-10-10 9:37 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-10 9:36 [PATCH 00/10] dcache cleanups Christoph Hellwig
2010-10-10 9:36 ` [PATCH 01/10] [PATCH] fs: take dcache_lock inside __d_path Christoph Hellwig
2010-10-10 9:36 ` Christoph Hellwig [this message]
2010-10-10 9:36 ` [PATCH 03/10] fs: use percpu counter for nr_dentry and nr_dentry_unused Christoph Hellwig
2010-10-10 9:36 ` [PATCH 04/10] fs: improve DCACHE_REFERENCED usage Christoph Hellwig
2010-10-10 9:36 ` [PATCH 05/10] fs: split __shrink_dcache_sb Christoph Hellwig
2010-10-10 9:36 ` [PATCH 06/10] fs: clean up dentry lru modification Christoph Hellwig
2010-10-10 9:36 ` [PATCH 07/10] fs: use RCU read side protection in d_validate Christoph Hellwig
2010-10-10 9:36 ` [PATCH 08/10] exportfs: use dget_parent Christoph Hellwig
2010-10-10 9:36 ` [PATCH 09/10] smbfs: " Christoph Hellwig
2010-10-10 9:36 ` [PATCH 10/10] fsnotify: " Christoph Hellwig
2010-10-11 13:59 ` Eric Paris
2010-10-13 1:04 ` [PATCH 00/10] dcache cleanups Dave Chinner
2010-10-13 11:21 ` Christoph Hellwig
2010-10-13 1:46 ` Dave Chinner
2010-10-13 11:22 ` Christoph Hellwig
2010-10-13 15:56 ` Christoph Hellwig
2010-10-16 8:17 ` Nick Piggin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101010093720.562471644@canuck.infradead.org \
--to=hch@infradead.org \
--cc=eparis@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).