Patch "FS-Cache: Increase reference of parent after registering, netfs success" has been added to the 3.14-stable tree
This is a note to let you know that I've just added the patch titled
FS-Cache: Increase reference of parent after registering, netfs success
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
fs-cache-increase-reference-of-parent-after-registering-netfs-success.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
86108c2e34a26e4bec3c6ddb23390bf8cedcf391Mon Sep 17 00:00:00 2001
From: Kinglong Mee <[email protected]>
Date: Wed, 4 Nov 2015 15:20:15 +0000
Subject: FS-Cache: Increase reference of parent after registering, netfs success
From: Kinglong Mee <[email protected]>
commit 86108c2e34a26e4bec3c6ddb23390bf8cedcf391 upstream.
If netfs exist, fscache should not increase the reference of parent's usage and n_children, otherwise, never be decreased.
v2: thanks David's suggest,
move increasing reference of parent if success use kmem_cache_free() freeing primary_index directly
v3: don't move "netfs->primary_index->parent = &fscache_fsdef_index;"
--- fs/fscache/netfs.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
fs/fscache/netfs.c +4 -5
@@ -47,9 +47,6 @@ int __fscache_register_netfs(struct fsca netfs->primary_index->netfs_data = netfs; netfs->primary_index->flags =1 <<FSCACHE_COOKIE_ENABLED ; -atomic_inc (&netfs->primary_index->parent->usage); -atomic_inc (&netfs->primary_index->parent->n_children); -spin_lock_init (&netfs->primary_index->lock);INIT_HLIST_HEAD (&netfs->primary_index->backing_objects);
@@ -62,6 +59,9 @@ int __fscache_register_netfs(struct fsca goto already_registered; } +atomic_inc (&netfs->primary_index->parent->usage); +atomic_inc (&netfs->primary_index->parent->n_children); +list_add (&netfs->link, &fscache_netfs_list); ret =0 ;
@@ -72,8 +72,7 @@ already_registered:up_write (&fscache_addremove_sem);if (ret <0 ) { - netfs->primary_index->parent =NULL ; -__fscache_cookie_put (netfs->primary_index); +kmem_cache_free (fscache_cookie_jar, netfs->primary_index); netfs->primary_index =NULL ; }
Patches currently in stable-queue which might be from [email protected] are
queue-3.14/fs-cache-increase-reference-of-parent-after-registering-netfs-success.patch queue-3.14/fs-cache-don-t-override-netfs-s-primary_index-if-registering-failed.patch