[RHEL7,COMMIT] fuse kio: Delete excess unlist in pcs_csset_fini()

Submitted by Konstantin Khorenko on June 15, 2018, 12:04 p.m.

Details

Message ID 201806151204.w5FC4lB9010190@finist_ce7.work
State New
Series "fuse kio: Delete excess unlist in pcs_csset_fini()"
Headers show

Commit Message

Konstantin Khorenko June 15, 2018, 12:04 p.m.
The commit is pushed to "branch-rh7-3.10.0-693.21.1.vz7.50.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-693.21.1.vz7.50.9
------>
commit 5b758aab455ba4dd80a78198be7876dfbae42046
Author: Kirill Tkhai <ktkhai@virtuozzo.com>
Date:   Fri Jun 15 15:04:47 2018 +0300

    fuse kio: Delete excess unlist in pcs_csset_fini()
    
    pcs_cs_isolate() already does this later.
    
    Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
    Reviewed-by: Pavel Butsykin <pbutsykin@virtuozzo.com>
---
 fs/fuse/kio/pcs/pcs_cs.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/fs/fuse/kio/pcs/pcs_cs.c b/fs/fuse/kio/pcs/pcs_cs.c
index 27f0bc3754d9..b65e16be9f85 100644
--- a/fs/fuse/kio/pcs/pcs_cs.c
+++ b/fs/fuse/kio/pcs/pcs_cs.c
@@ -717,8 +717,7 @@  static void pcs_cs_isolate(struct pcs_cs *cs, struct list_head *dispose)
 
 	cs->is_dead = 1;
 	spin_lock(&cs->css->lock);
-	if (!hlist_unhashed(&cs->hlist))
-		hlist_del_rcu(&cs->hlist);
+	hlist_del_rcu(&cs->hlist);
 	list_del(&cs->lru_link);
 	list_del(&cs->bl_link);
 	cs->css->ncs--;
@@ -1086,7 +1085,6 @@  void pcs_csset_fini(struct pcs_cs_set *css)
 
 			rcu_read_lock();
 			cs = hlist_entry(css->ht[i].first, struct pcs_cs, hlist);
-			hlist_del_init_rcu(&cs->hlist);
 			spin_unlock(&css->lock);
 
 			spin_lock(&cs->lock);