@@ -12,18 +12,3 @@ struct fscache_netfs afs_cache_netfs = {
.name = "afs",
.version = 2,
};
-
-struct fscache_cookie_def afs_cell_cache_index_def = {
- .name = "AFS.cell",
- .type = FSCACHE_COOKIE_TYPE_INDEX,
-};
-
-struct fscache_cookie_def afs_volume_cache_index_def = {
- .name = "AFS.volume",
- .type = FSCACHE_COOKIE_TYPE_INDEX,
-};
-
-struct fscache_cookie_def afs_vnode_cache_index_def = {
- .name = "AFS.vnode",
- .type = FSCACHE_COOKIE_TYPE_DATAFILE,
-};
@@ -592,7 +592,9 @@ static int afs_activate_cell(struct afs_net *net, struct afs_cell *cell)
#ifdef CONFIG_AFS_FSCACHE
cell->cache = fscache_acquire_cookie(afs_cache_netfs.primary_index,
- &afs_cell_cache_index_def,
+ FSCACHE_COOKIE_TYPE_INDEX,
+ "AFS.cell",
+ 0,
NULL,
cell->name, strlen(cell->name),
NULL, 0,
@@ -490,12 +490,15 @@ static void afs_get_inode_cache(struct afs_vnode *vnode)
key.vnode_id_ext[1] = vnode->fid.vnode_hi;
aux.data_version = vnode->status.data_version;
- vnode->cache = fscache_acquire_cookie(vnode->volume->cache,
- &afs_vnode_cache_index_def,
- NULL,
- &key, sizeof(key),
- &aux, sizeof(aux),
- vnode->status.size, true);
+ vnode->cache = fscache_acquire_cookie(
+ vnode->volume->cache,
+ FSCACHE_COOKIE_TYPE_DATAFILE,
+ "AFS.vnode",
+ vnode->status.type == AFS_FTYPE_FILE ? 0 : FSCACHE_ADV_SINGLE_CHUNK,
+ NULL,
+ &key, sizeof(key),
+ &aux, sizeof(aux),
+ vnode->status.size, true);
#endif
}
@@ -821,13 +821,6 @@ extern void afs_merge_fs_addr6(struct afs_addr_list *, __be32 *, u16);
*/
#ifdef CONFIG_AFS_FSCACHE
extern struct fscache_netfs afs_cache_netfs;
-extern struct fscache_cookie_def afs_cell_cache_index_def;
-extern struct fscache_cookie_def afs_volume_cache_index_def;
-extern struct fscache_cookie_def afs_vnode_cache_index_def;
-#else
-#define afs_cell_cache_index_def (*(struct fscache_cookie_def *) NULL)
-#define afs_volume_cache_index_def (*(struct fscache_cookie_def *) NULL)
-#define afs_vnode_cache_index_def (*(struct fscache_cookie_def *) NULL)
#endif
/*
@@ -183,8 +183,9 @@ void afs_activate_volume(struct afs_volume *volume)
{
#ifdef CONFIG_AFS_FSCACHE
volume->cache = fscache_acquire_cookie(volume->cell->cache,
- &afs_volume_cache_index_def,
- NULL,
+ FSCACHE_COOKIE_TYPE_INDEX,
+ "AFS.vol",
+ 0, NULL,
&volume->vid, sizeof(volume->vid),
NULL, 0, 0, true);
#endif
@@ -41,7 +41,7 @@ static struct fscache_object *cachefiles_alloc_object(
fscache_object_init(&object->fscache, cookie, &cache->cache);
- object->type = cookie->def->type;
+ object->type = cookie->type;
/* get hold of the raw key
* - stick the length on the front and leave space on the back for the
@@ -109,7 +109,7 @@ static int cachefiles_lookup_object(struct fscache_object *_object)
/* polish off by setting the attributes of non-index files */
if (ret == 0 &&
- object->fscache.cookie->def->type != FSCACHE_COOKIE_TYPE_INDEX)
+ object->fscache.cookie->type != FSCACHE_COOKIE_TYPE_INDEX)
cachefiles_attr_changed(&object->fscache);
if (ret < 0 && ret != -ETIMEDOUT) {
@@ -39,7 +39,7 @@ int cachefiles_check_object_type(struct cachefiles_object *object)
if (!object->fscache.cookie)
strcpy(type, "C3");
else
- snprintf(type, 3, "%02x", object->fscache.cookie->def->type);
+ snprintf(type, 3, "%02x", object->fscache.cookie->type);
_enter("%p{%s}", object, type);
@@ -118,7 +118,7 @@ int cachefiles_set_object_xattr(struct cachefiles_object *object,
if (!buf)
return -ENOMEM;
- buf->type = object->fscache.cookie->def->type;
+ buf->type = object->fscache.cookie->type;
if (len > 0)
memcpy(buf->data, fscache_get_aux(object->fscache.cookie), len);
@@ -157,7 +157,7 @@ int cachefiles_check_auxdata(struct cachefiles_object *object)
ret = vfs_getxattr(dentry, cachefiles_xattr_cache, buf, tlen);
if (ret == tlen &&
- buf->type == object->fscache.cookie->def->type &&
+ buf->type == object->fscache.cookie->type &&
memcmp(buf->data, p, len) == 0)
ret = 0;
else
@@ -43,10 +43,9 @@ static void fscache_print_cookie(struct fscache_cookie *cookie, char prefix)
cookie->flags,
atomic_read(&cookie->n_children),
atomic_read(&cookie->n_active));
- pr_err("%c-cookie d=%p{%s}\n",
+ pr_err("%c-cookie d=%s\n",
prefix,
- cookie->def,
- cookie->def ? cookie->def->name : "?");
+ cookie->type_name);
o = READ_ONCE(cookie->backing_objects.first);
if (o) {
@@ -149,7 +148,9 @@ static atomic_t fscache_cookie_debug_id = ATOMIC_INIT(1);
*/
struct fscache_cookie *fscache_alloc_cookie(
struct fscache_cookie *parent,
- const struct fscache_cookie_def *def,
+ enum fscache_cookie_type type,
+ const char *type_name,
+ u8 advice,
struct fscache_cache_tag *preferred_cache,
const void *index_key, size_t index_key_len,
const void *aux_data, size_t aux_data_len,
@@ -162,8 +163,11 @@ struct fscache_cookie *fscache_alloc_cookie(
if (!cookie)
return NULL;
+ cookie->type = type;
+ cookie->advice = advice;
cookie->key_len = index_key_len;
cookie->aux_len = aux_data_len;
+ strlcpy(cookie->type_name, type_name, sizeof(cookie->type_name));
if (fscache_set_key(cookie, index_key, index_key_len) < 0)
goto nomem;
@@ -185,13 +189,10 @@ struct fscache_cookie *fscache_alloc_cookie(
*/
atomic_set(&cookie->n_active, 1);
- cookie->def = def;
cookie->parent = parent;
-
cookie->preferred_cache = fscache_get_cache_tag(preferred_cache);
cookie->flags = (1 << FSCACHE_COOKIE_NO_DATA_YET);
- cookie->type = def->type;
spin_lock_init(&cookie->lock);
INIT_HLIST_HEAD(&cookie->backing_objects);
@@ -253,7 +254,6 @@ struct fscache_cookie *fscache_hash_cookie(struct fscache_cookie *candidate)
* - parent specifies the parent object
* - the top level index cookie for each netfs is stored in the fscache_netfs
* struct upon registration
- * - def points to the definition
* - all attached caches will be searched to see if they contain this object
* - index objects aren't stored on disk until there's a dependent file that
* needs storing
@@ -264,7 +264,9 @@ struct fscache_cookie *fscache_hash_cookie(struct fscache_cookie *candidate)
*/
struct fscache_cookie *__fscache_acquire_cookie(
struct fscache_cookie *parent,
- const struct fscache_cookie_def *def,
+ enum fscache_cookie_type type,
+ const char *type_name,
+ u8 advice,
struct fscache_cache_tag *preferred_cache,
const void *index_key, size_t index_key_len,
const void *aux_data, size_t aux_data_len,
@@ -273,11 +275,8 @@ struct fscache_cookie *__fscache_acquire_cookie(
{
struct fscache_cookie *candidate, *cookie;
- BUG_ON(!def);
-
_enter("{%s},{%s},%u",
- parent ? (char *) parent->def->name : "<no-parent>",
- def->name, enable);
+ parent ? parent->type_name : "<no-parent>", type_name, enable);
if (!index_key || !index_key_len || index_key_len > 255 || aux_data_len > 255)
return NULL;
@@ -296,12 +295,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
}
/* validate the definition */
- BUG_ON(!def->name[0]);
-
- BUG_ON(def->type == FSCACHE_COOKIE_TYPE_INDEX &&
+ BUG_ON(type == FSCACHE_COOKIE_TYPE_INDEX &&
parent->type != FSCACHE_COOKIE_TYPE_INDEX);
- candidate = fscache_alloc_cookie(parent, def, preferred_cache,
+ candidate = fscache_alloc_cookie(parent, type, type_name, advice,
+ preferred_cache,
index_key, index_key_len,
aux_data, aux_data_len,
object_size);
@@ -496,7 +494,7 @@ static int fscache_alloc_object(struct fscache_cache *cache,
struct fscache_object *object;
int ret;
- _enter("%p,%p{%s}", cache, cookie, cookie->def->name);
+ _enter("%p,%p{%s}", cache, cookie, cookie->type_name);
spin_lock(&cookie->lock);
hlist_for_each_entry(object, &cookie->backing_objects,
@@ -523,7 +521,7 @@ static int fscache_alloc_object(struct fscache_cache *cache,
object->debug_id = atomic_inc_return(&fscache_object_debug_id);
_debug("ALLOC OBJ%x: %s {%lx}",
- object->debug_id, cookie->def->name, object->events);
+ object->debug_id, cookie->type_name, object->events);
ret = fscache_alloc_object(cache, cookie->parent);
if (ret < 0)
@@ -571,7 +569,7 @@ static int fscache_attach_object(struct fscache_cookie *cookie,
struct fscache_cache *cache = object->cache;
int ret;
- _enter("{%s},{OBJ%x}", cookie->def->name, object->debug_id);
+ _enter("{%s},{OBJ%x}", cookie->type_name, object->debug_id);
ASSERTCMP(object->cookie, ==, cookie);
@@ -633,7 +631,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
{
struct fscache_object *object;
- _enter("{%s}", cookie->def->name);
+ _enter("{%s}", cookie->type_name);
fscache_stat(&fscache_n_invalidates);
@@ -698,7 +696,7 @@ void __fscache_update_cookie(struct fscache_cookie *cookie, const void *aux_data
return;
}
- _enter("{%s}", cookie->def->name);
+ _enter("{%s}", cookie->type_name);
spin_lock(&cookie->lock);
@@ -737,7 +735,7 @@ void __fscache_disable_cookie(struct fscache_cookie *cookie,
if (atomic_read(&cookie->n_children) != 0) {
pr_err("Cookie '%s' still has children\n",
- cookie->def->name);
+ cookie->type_name);
BUG();
}
@@ -816,7 +814,7 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie,
}
_enter("%p{%s,%d},%d",
- cookie, cookie->def->name,
+ cookie, cookie->type_name,
atomic_read(&cookie->n_active), retire);
trace_fscache_relinquish(cookie, retire);
@@ -827,9 +825,6 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie,
__fscache_disable_cookie(cookie, aux_data, retire);
- /* Clear pointers back to the netfs */
- cookie->def = NULL;
-
if (cookie->parent) {
ASSERTCMP(atomic_read(&cookie->parent->usage), >, 0);
ASSERTCMP(atomic_read(&cookie->parent->n_children), >, 0);
@@ -1012,7 +1007,7 @@ static int fscache_cookies_seq_show(struct seq_file *m, void *v)
atomic_read(&cookie->n_active),
type,
cookie->flags,
- cookie->def->name);
+ cookie->type_name);
keylen = cookie->key_len;
auxlen = cookie->aux_len;
@@ -33,29 +33,14 @@
* cache. It can create whatever objects it likes in that index, including
* further indices.
*/
-static struct fscache_cookie_def fscache_fsdef_index_def = {
- .name = ".FS-Cache",
- .type = FSCACHE_COOKIE_TYPE_INDEX,
-};
-
struct fscache_cookie fscache_fsdef_index = {
.debug_id = 1,
.usage = ATOMIC_INIT(1),
.n_active = ATOMIC_INIT(1),
.lock = __SPIN_LOCK_UNLOCKED(fscache_fsdef_index.lock),
.backing_objects = HLIST_HEAD_INIT,
- .def = &fscache_fsdef_index_def,
+ .type_name = ".fscach",
.flags = 1 << FSCACHE_COOKIE_ENABLED,
.type = FSCACHE_COOKIE_TYPE_INDEX,
};
EXPORT_SYMBOL(fscache_fsdef_index);
-
-/*
- * Definition of an entry in the root index. Each entry is an index, keyed to
- * a specific netfs and only applicable to a particular version of the index
- * structure used by that netfs.
- */
-struct fscache_cookie_def fscache_fsdef_netfs_def = {
- .name = "FSDEF.netfs",
- .type = FSCACHE_COOKIE_TYPE_INDEX,
-};
@@ -64,7 +64,9 @@ extern const struct seq_operations fscache_cookies_seq_ops;
extern void fscache_free_cookie(struct fscache_cookie *);
extern struct fscache_cookie *fscache_alloc_cookie(struct fscache_cookie *,
- const struct fscache_cookie_def *,
+ enum fscache_cookie_type,
+ const char *,
+ u8,
struct fscache_cache_tag *,
const void *, size_t,
const void *, size_t,
@@ -77,7 +79,6 @@ extern void fscache_cookie_put(struct fscache_cookie *,
* fsdef.c
*/
extern struct fscache_cookie fscache_fsdef_index;
-extern struct fscache_cookie_def fscache_fsdef_netfs_def;
/*
* histogram.c
@@ -21,8 +21,9 @@ int __fscache_register_netfs(struct fscache_netfs *netfs)
/* allocate a cookie for the primary index */
candidate = fscache_alloc_cookie(&fscache_fsdef_index,
- &fscache_fsdef_netfs_def,
- NULL,
+ FSCACHE_COOKIE_TYPE_INDEX,
+ ".netfs",
+ 0, NULL,
netfs->name, strlen(netfs->name),
&netfs->version, sizeof(netfs->version),
0);
@@ -21,8 +21,6 @@ struct fscache_objlist_data {
unsigned long config; /* display configuration */
#define FSCACHE_OBJLIST_CONFIG_KEY 0x00000001 /* show object keys */
#define FSCACHE_OBJLIST_CONFIG_AUX 0x00000002 /* show object auxdata */
-#define FSCACHE_OBJLIST_CONFIG_COOKIE 0x00000004 /* show objects with cookies */
-#define FSCACHE_OBJLIST_CONFIG_NOCOOKIE 0x00000008 /* show objects without cookies */
#define FSCACHE_OBJLIST_CONFIG_BUSY 0x00000010 /* show busy objects */
#define FSCACHE_OBJLIST_CONFIG_IDLE 0x00000020 /* show idle objects */
#define FSCACHE_OBJLIST_CONFIG_PENDWR 0x00000040 /* show objects with pending writes */
@@ -170,7 +168,7 @@ static int fscache_objlist_show(struct seq_file *m, void *v)
if ((unsigned long) v == 1) {
seq_puts(m, "OBJECT PARENT STAT CHLDN OPS OOP IPR EX READS"
" EM EV FL S"
- " | COOKIE NETFS_COOKIE_DEF TY FL");
+ " | COOKIE TYPE TY FL");
if (config & (FSCACHE_OBJLIST_CONFIG_KEY |
FSCACHE_OBJLIST_CONFIG_AUX))
seq_puts(m, " ");
@@ -189,7 +187,7 @@ static int fscache_objlist_show(struct seq_file *m, void *v)
if ((unsigned long) v == 2) {
seq_puts(m, "======== ======== ==== ===== === === === == ====="
" == == == ="
- " | ======== ================ == ===");
+ " | ======== ======= == ===");
if (config & (FSCACHE_OBJLIST_CONFIG_KEY |
FSCACHE_OBJLIST_CONFIG_AUX))
seq_puts(m, " ================");
@@ -213,8 +211,6 @@ static int fscache_objlist_show(struct seq_file *m, void *v)
cookie = obj->cookie;
if (~config) {
- FILTER(cookie->def,
- COOKIE, NOCOOKIE);
FILTER(fscache_object_is_active(obj) ||
obj->n_ops != 0 ||
obj->n_obj_ops != 0 ||
@@ -263,9 +259,9 @@ static int fscache_objlist_show(struct seq_file *m, void *v)
break;
}
- seq_printf(m, "%08x %-16s %s %3lx",
+ seq_printf(m, "%08x %-7s %s %3lx",
cookie->debug_id,
- cookie->def->name,
+ cookie->type_name,
type,
cookie->flags);
@@ -338,8 +334,6 @@ static void fscache_objlist_config(struct fscache_objlist_data *data)
switch (buf[len]) {
case 'K': config |= FSCACHE_OBJLIST_CONFIG_KEY; break;
case 'A': config |= FSCACHE_OBJLIST_CONFIG_AUX; break;
- case 'C': config |= FSCACHE_OBJLIST_CONFIG_COOKIE; break;
- case 'c': config |= FSCACHE_OBJLIST_CONFIG_NOCOOKIE; break;
case 'B': config |= FSCACHE_OBJLIST_CONFIG_BUSY; break;
case 'b': config |= FSCACHE_OBJLIST_CONFIG_IDLE; break;
case 'W': config |= FSCACHE_OBJLIST_CONFIG_PENDWR; break;
@@ -354,8 +348,6 @@ static void fscache_objlist_config(struct fscache_objlist_data *data)
rcu_read_unlock();
key_put(key);
- if (!(config & (FSCACHE_OBJLIST_CONFIG_COOKIE | FSCACHE_OBJLIST_CONFIG_NOCOOKIE)))
- config |= FSCACHE_OBJLIST_CONFIG_COOKIE | FSCACHE_OBJLIST_CONFIG_NOCOOKIE;
if (!(config & (FSCACHE_OBJLIST_CONFIG_BUSY | FSCACHE_OBJLIST_CONFIG_IDLE)))
config |= FSCACHE_OBJLIST_CONFIG_BUSY | FSCACHE_OBJLIST_CONFIG_IDLE;
if (!(config & (FSCACHE_OBJLIST_CONFIG_PENDWR | FSCACHE_OBJLIST_CONFIG_NOPENDWR)))
@@ -474,7 +474,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
}
_debug("LOOKUP \"%s\" in \"%s\"",
- cookie->def->name, object->cache->tag->name);
+ cookie->type_name, object->cache->tag->name);
fscache_stat(&fscache_n_object_lookups);
fscache_stat(&fscache_n_cop_lookup_object);
@@ -50,7 +50,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
_enter("%p", cookie);
- ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
+ ASSERTCMP(cookie->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
fscache_stat(&fscache_n_attr_changed);
@@ -42,24 +42,17 @@
/* pattern used to fill dead space in an index entry */
#define FSCACHE_INDEX_DEADFILL_PATTERN 0x79
-struct pagevec;
struct fscache_cache_tag;
struct fscache_cookie;
struct fscache_netfs;
-/*
- * fscache cookie definition
- */
-struct fscache_cookie_def {
- /* name of cookie type */
- char name[16];
-
- /* cookie type */
- uint8_t type;
-#define FSCACHE_COOKIE_TYPE_INDEX 0
-#define FSCACHE_COOKIE_TYPE_DATAFILE 1
+enum fscache_cookie_type {
+ FSCACHE_COOKIE_TYPE_INDEX,
+ FSCACHE_COOKIE_TYPE_DATAFILE,
};
+#define FSCACHE_ADV_SINGLE_CHUNK 0x01 /* The object is a single chunk of data */
+
/*
* fscache cached network filesystem type
* - name, version and ops must be filled in before registration
@@ -85,11 +78,11 @@ struct fscache_cookie {
unsigned int debug_id;
spinlock_t lock;
struct hlist_head backing_objects; /* object(s) backing this file/index */
- const struct fscache_cookie_def *def; /* definition */
struct fscache_cookie *parent; /* parent of this entry */
struct fscache_cache_tag *preferred_cache; /* The preferred cache or NULL */
struct hlist_bl_node hash_link; /* Link in hash table */
struct list_head proc_link; /* Link in proc list */
+ char type_name[8]; /* Cookie type name */
unsigned long flags;
#define FSCACHE_COOKIE_LOOKING_UP 0 /* T if non-index cookie being looked up still */
@@ -103,7 +96,8 @@ struct fscache_cookie {
#define FSCACHE_COOKIE_ACQUIRED 9 /* T if cookie is in use */
#define FSCACHE_COOKIE_RELINQUISHING 10 /* T if cookie is being relinquished */
- u8 type; /* Type of object */
+ enum fscache_cookie_type type:8;
+ u8 advice; /* FSCACHE_COOKIE_ADV_* */
u8 key_len; /* Length of index key */
u8 aux_len; /* Length of auxiliary data */
u32 key_hash; /* Hash of parent, type, key, len */
@@ -136,7 +130,9 @@ extern void __fscache_release_cache_tag(struct fscache_cache_tag *);
extern struct fscache_cookie *__fscache_acquire_cookie(
struct fscache_cookie *,
- const struct fscache_cookie_def *,
+ enum fscache_cookie_type,
+ const char *,
+ u8,
struct fscache_cache_tag *,
const void *, size_t,
const void *, size_t,
@@ -225,7 +221,9 @@ void fscache_release_cache_tag(struct fscache_cache_tag *tag)
/**
* fscache_acquire_cookie - Acquire a cookie to represent a cache object
* @parent: The cookie that's to be the parent of this one
- * @def: A description of the cache object, including callback operations
+ * @type: Type of the cookie
+ * @type_name: Name of cookie type (max 7 chars)
+ * @advice: Advice flags (FSCACHE_COOKIE_ADV_*)
* @preferred_cache: The cache to use (or NULL)
* @index_key: The index key for this cookie
* @index_key_len: Size of the index key
@@ -246,7 +244,9 @@ void fscache_release_cache_tag(struct fscache_cache_tag *tag)
static inline
struct fscache_cookie *fscache_acquire_cookie(
struct fscache_cookie *parent,
- const struct fscache_cookie_def *def,
+ enum fscache_cookie_type type,
+ const char *type_name,
+ u8 advice,
struct fscache_cache_tag *preferred_cache,
const void *index_key,
size_t index_key_len,
@@ -256,7 +256,8 @@ struct fscache_cookie *fscache_acquire_cookie(
bool enable)
{
if (fscache_cookie_valid(parent) && fscache_cookie_enabled(parent))
- return __fscache_acquire_cookie(parent, def, preferred_cache,
+ return __fscache_acquire_cookie(parent, type, type_name, advice,
+ preferred_cache,
index_key, index_key_len,
aux_data, aux_data_len,
object_size, enable);
@@ -233,7 +233,7 @@ TRACE_EVENT(fscache_acquire,
__entry->p_usage = atomic_read(&cookie->parent->usage);
__entry->p_n_children = atomic_read(&cookie->parent->n_children);
__entry->p_flags = cookie->parent->flags;
- memcpy(__entry->name, cookie->def->name, 8);
+ memcpy(__entry->name, cookie->type_name, 8);
__entry->name[7] = 0;
),
Remove the cookie definition structure so that there's no pointers from that back into the network filesystem. All of the method pointers that were in there have been removed anyway. Any remaining information is stashed in the cookie. Signed-off-by: David Howells <dhowells@redhat.com> --- fs/afs/cache.c | 15 ------------ fs/afs/cell.c | 4 ++- fs/afs/inode.c | 15 +++++++----- fs/afs/internal.h | 7 ----- fs/afs/volume.c | 5 ++-- fs/cachefiles/interface.c | 4 ++- fs/cachefiles/xattr.c | 6 ++--- fs/fscache/cookie.c | 51 ++++++++++++++++++---------------------- fs/fscache/fsdef.c | 17 +------------ fs/fscache/internal.h | 5 ++-- fs/fscache/netfs.c | 5 ++-- fs/fscache/object-list.c | 16 +++---------- fs/fscache/object.c | 2 +- fs/fscache/page.c | 2 +- include/linux/fscache.h | 37 +++++++++++++++-------------- include/trace/events/fscache.h | 2 +- 16 files changed, 76 insertions(+), 117 deletions(-)