From: Kinglong Mee <kinglongmee@gmail.com>
To: Al Viro <viro@zeniv.linux.org.uk>,
"J. Bruce Fields" <bfields@fieldses.org>,
"linux-nfs@vger.kernel.org" <linux-nfs@vger.kernel.org>,
linux-fsdevel@vger.kernel.org
Cc: NeilBrown <neilb@suse.de>,
Trond Myklebust <trond.myklebust@primarydata.com>,
kinglongmee@gmail.com
Subject: [PATCH 08/10 v7] sunrpc: New helper cache_delete_entry for deleting cache_head directly
Date: Sat, 11 Jul 2015 20:51:13 +0800 [thread overview]
Message-ID: <55A11141.3050806@gmail.com> (raw)
In-Reply-To: <55A11010.6050005@gmail.com>
A new helper cache_delete_entry() for delete cache_head from
cache_detail directly.
It will be used by pin_kill, so make sure the cache_detail is valid
before deleting is needed.
Because pin_kill is not many times, so the influence of performance
is accepted.
v7, same as v6.
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
---
include/linux/sunrpc/cache.h | 1 +
net/sunrpc/cache.c | 30 ++++++++++++++++++++++++++++++
2 files changed, 31 insertions(+)
diff --git a/include/linux/sunrpc/cache.h b/include/linux/sunrpc/cache.h
index ecc0ff6..5a4b921 100644
--- a/include/linux/sunrpc/cache.h
+++ b/include/linux/sunrpc/cache.h
@@ -210,6 +210,7 @@ extern int cache_check(struct cache_detail *detail,
struct cache_head *h, struct cache_req *rqstp);
extern void cache_flush(void);
extern void cache_purge(struct cache_detail *detail);
+extern void cache_delete_entry(struct cache_detail *cd, struct cache_head *h);
#define NEVER (0x7FFFFFFF)
extern void __init cache_initialize(void);
extern int cache_register_net(struct cache_detail *cd, struct net *net);
diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index ad2155c..8a27483 100644
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -458,6 +458,36 @@ static int cache_clean(void)
return rv;
}
+void cache_delete_entry(struct cache_detail *detail, struct cache_head *h)
+{
+ struct cache_detail *tmp;
+
+ if (!detail || !h)
+ return;
+
+ spin_lock(&cache_list_lock);
+ list_for_each_entry(tmp, &cache_list, others) {
+ if (tmp == detail)
+ goto found;
+ }
+ spin_unlock(&cache_list_lock);
+ printk(KERN_WARNING "%s: Deleted cache detail %p\n", __func__, detail);
+ return ;
+
+found:
+ write_lock(&detail->hash_lock);
+
+ list_del_init(&h->cache_list);
+ detail->entries--;
+ set_bit(CACHE_CLEANED, &h->flags);
+
+ write_unlock(&detail->hash_lock);
+ spin_unlock(&cache_list_lock);
+
+ cache_put(h, detail);
+}
+EXPORT_SYMBOL_GPL(cache_delete_entry);
+
/*
* We want to regularly clean the cache, so we need to schedule some work ...
*/
--
2.4.3
prev parent reply other threads:[~2015-07-11 12:51 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-11 12:46 [PATCH 00/10 v7] NFSD: Pin to vfsmount for nfsd exports cache Kinglong Mee
2015-07-11 12:49 ` [PATCH 05/10 v7] sunrpc: Store cache_detail in seq_file's private, directly Kinglong Mee
2015-07-11 12:49 ` [PATCH 06/10 v7] sunrpc/nfsd: Remove redundant code by exports seq_operations functions Kinglong Mee
[not found] ` <55A11010.6050005-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-07-11 12:47 ` [PATCH 01/10 v7] fs_pin: Initialize value for fs_pin explicitly Kinglong Mee
2015-07-11 12:47 ` [PATCH 02/10 v7] fs_pin: Export functions for specific filesystem Kinglong Mee
2015-07-11 12:48 ` [PATCH 03/10 v7] path: New helpers path_get_pin/path_put_unpin for path pin Kinglong Mee
2015-07-11 12:48 ` [PATCH 04/10 v7] fs: New helper legitimize_mntget() for getting a legitimize mnt Kinglong Mee
2015-07-11 12:50 ` [PATCH 07/10 v7] sunrpc: Switch to using list_head instead single list Kinglong Mee
[not found] ` <55A11112.8080502-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-07-11 12:54 ` Christoph Hellwig
2015-07-13 1:30 ` NeilBrown
2015-07-13 8:27 ` Kinglong Mee
2015-07-11 12:51 ` [PATCH 09/10 v7] sunrpc: Support get_ref/put_ref for reference change in cache_head Kinglong Mee
2015-07-11 12:52 ` [PATCH 10/10 v7] nfsd: Allows user un-mounting filesystem where nfsd exports base on Kinglong Mee
[not found] ` <55A111A8.2040701-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-07-13 3:39 ` NeilBrown
2015-07-13 4:02 ` Al Viro
[not found] ` <20150713040258.GM17109-3bDd1+5oDREiFSDQTTA3OLVCufUGDwFn@public.gmane.org>
2015-07-13 5:19 ` NeilBrown
2015-07-13 6:02 ` Al Viro
2015-07-13 4:20 ` NeilBrown
2015-07-13 4:45 ` Al Viro
[not found] ` <20150713044553.GN17109-3bDd1+5oDREiFSDQTTA3OLVCufUGDwFn@public.gmane.org>
2015-07-13 5:21 ` NeilBrown
2015-07-13 6:02 ` NeilBrown
2015-07-13 6:08 ` Al Viro
[not found] ` <20150713060802.GP17109-3bDd1+5oDREiFSDQTTA3OLVCufUGDwFn@public.gmane.org>
2015-07-13 6:32 ` NeilBrown
2015-07-13 6:43 ` Al Viro
2015-07-15 3:49 ` NeilBrown
2015-07-15 4:57 ` Al Viro
2015-07-15 6:51 ` NeilBrown
2015-07-24 2:05 ` NeilBrown
2015-07-27 2:28 ` Kinglong Mee
[not found] ` <55B59764.1020506-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-07-27 2:51 ` NeilBrown
2015-07-27 3:17 ` Kinglong Mee
2015-07-15 21:07 ` J. Bruce Fields
[not found] ` <20150715210756.GE21669-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
2015-07-15 23:40 ` NeilBrown
2015-07-16 20:51 ` J. Bruce Fields
[not found] ` <20150716205148.GC10673-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
2015-07-21 21:58 ` NeilBrown
2015-07-22 15:08 ` J. Bruce Fields
[not found] ` <20150722150840.GH22718-uC3wQj2KruNg9hUCZPvPmw@public.gmane.org>
2015-07-23 23:46 ` export table lookup: was " NeilBrown
2015-07-24 19:48 ` J. Bruce Fields
2015-07-25 0:40 ` NeilBrown
2015-07-11 12:51 ` Kinglong Mee [this message]
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=55A11141.3050806@gmail.com \
--to=kinglongmee@gmail.com \
--cc=bfields@fieldses.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=neilb@suse.de \
--cc=trond.myklebust@primarydata.com \
--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).