[v2,1/2] FSCACHE: Increase reference of parent after registering netfs success

Commit Message

Kinglong Mee April 13, 2015, 1:01 p.m. UTC

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

Signed-off-by: Kinglong Mee <[e-mail]>
---
 fs/fscache/netfs.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

Comments

David Howells April 13, 2015, 1:12 p.m. UTC | #1

Kinglong Mee <[e-mail]> wrote:

> -	netfs->primary_index->parent		= &fscache_fsdef_index;

fscache_fsdef_index is a static variable so leave this where it is.

David
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/fs/fscache/netfs.c b/fs/fscache/netfs.c
index 6d941f5..bea1f2e 100644
--- a/fs/fscache/netfs.c
+++ b/fs/fscache/netfs.c
@@ -43,13 +43,9 @@  int __fscache_register_netfs(struct fscache_netfs *netfs)
 	atomic_set(&netfs->primary_index->n_active, 1);
 
 	netfs->primary_index->def		= &fscache_fsdef_netfs_def;
-	netfs->primary_index->parent		= &fscache_fsdef_index;
 	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 +58,10 @@  int __fscache_register_netfs(struct fscache_netfs *netfs)
 			goto already_registered;
 	}
 
+	netfs->primary_index->parent = &fscache_fsdef_index;
+	atomic_inc(&netfs->primary_index->parent->usage);
+	atomic_inc(&netfs->primary_index->parent->n_children);
+
 	list_add(&netfs->link, &fscache_netfs_list);
 	ret = 0;
 
@@ -71,8 +71,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;
 	}