Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 610be24e authored by David Howells's avatar David Howells
Browse files

FS-Cache: Uninline fscache_object_init() 



Uninline fscache_object_init() so as not to expose some of the FS-Cache
internals to the cache backend.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Tested-By: default avatarMilosz Tanski <milosz@adfin.com>
Acked-by: default avatarJeff Layton <jlayton@redhat.com>
parent 0c59a95d

fs/fscache/object.c

+38 −2
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ unsupported_event: 
/*

 * execute an object

 */

void fscache_object_work_func(struct work_struct *work)

static void fscache_object_work_func(struct work_struct *work)

{

	struct fscache_object *object =

		container_of(work, struct fscache_object, work);
@@ -379,7 +379,43 @@ void fscache_object_work_func(struct work_struct *work) 
	clear_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);

	fscache_put_object(object);

}

EXPORT_SYMBOL(fscache_object_work_func);



/**

 * fscache_object_init - Initialise a cache object description

 * @object: Object description

 * @cookie: Cookie object will be attached to

 * @cache: Cache in which backing object will be found

 *

 * Initialise a cache object description to its basic values.

 *

 * See Documentation/filesystems/caching/backend-api.txt for a complete

 * description.

 */

void fscache_object_init(struct fscache_object *object,

			 struct fscache_cookie *cookie,

			 struct fscache_cache *cache)

{

	atomic_inc(&cache->object_count);



	object->state = FSCACHE_OBJECT_INIT;

	spin_lock_init(&object->lock);

	INIT_LIST_HEAD(&object->cache_link);

	INIT_HLIST_NODE(&object->cookie_link);

	INIT_WORK(&object->work, fscache_object_work_func);

	INIT_LIST_HEAD(&object->dependents);

	INIT_LIST_HEAD(&object->dep_link);

	INIT_LIST_HEAD(&object->pending_ops);

	object->n_children = 0;

	object->n_ops = object->n_in_progress = object->n_exclusive = 0;

	object->events = object->event_mask = 0;

	object->flags = 0;

	object->store_limit = 0;

	object->store_limit_l = 0;

	object->cache = cache;

	object->cookie = cookie;

	object->parent = NULL;

}

EXPORT_SYMBOL(fscache_object_init);



/*

 * initialise an object

include/linux/fscache-cache.h

+2 −36
Original line number Diff line number Diff line
@@ -426,42 +426,8 @@ extern const char *fscache_object_states[]; 
	(test_bit(FSCACHE_IOERROR, &(obj)->cache->flags) &&	\

	 (obj)->state >= FSCACHE_OBJECT_DYING)



extern void fscache_object_work_func(struct work_struct *work);



/**

 * fscache_object_init - Initialise a cache object description

 * @object: Object description

 *

 * Initialise a cache object description to its basic values.

 *

 * See Documentation/filesystems/caching/backend-api.txt for a complete

 * description.

 */

static inline

void fscache_object_init(struct fscache_object *object,

			 struct fscache_cookie *cookie,

			 struct fscache_cache *cache)

{

	atomic_inc(&cache->object_count);



	object->state = FSCACHE_OBJECT_INIT;

	spin_lock_init(&object->lock);

	INIT_LIST_HEAD(&object->cache_link);

	INIT_HLIST_NODE(&object->cookie_link);

	INIT_WORK(&object->work, fscache_object_work_func);

	INIT_LIST_HEAD(&object->dependents);

	INIT_LIST_HEAD(&object->dep_link);

	INIT_LIST_HEAD(&object->pending_ops);

	object->n_children = 0;

	object->n_ops = object->n_in_progress = object->n_exclusive = 0;

	object->events = object->event_mask = 0;

	object->flags = 0;

	object->store_limit = 0;

	object->store_limit_l = 0;

	object->cache = cache;

	object->cookie = cookie;

	object->parent = NULL;

}

extern void fscache_object_init(struct fscache_object *, struct fscache_cookie *,

				struct fscache_cache *);



extern void fscache_object_lookup_negative(struct fscache_object *object);

extern void fscache_obtained_object(struct fscache_object *object);