diff options
| author | David S. Miller <davem@davemloft.net> | 2014-02-19 01:24:22 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-02-19 01:24:22 -0500 |
| commit | 1e8d6421cff2c24fe0b345711e7a21af02e8bcf5 (patch) | |
| tree | 773b30106efb9b48055bc93958e5a94ac53768ce /fs/fscache/object.c | |
| parent | f7b12606b5de323a2bb5ca1696558efde8f25441 (diff) | |
| parent | 960dfc4eb23a28495276b02604d7458e0e1a1ed8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/bonding/bond_3ad.h
drivers/net/bonding/bond_main.c
Two minor conflicts in bonding, both of which were overlapping
changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/fscache/object.c')
| -rw-r--r-- | fs/fscache/object.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/fscache/object.c b/fs/fscache/object.c index 53d35c504240..d3b4539f1651 100644 --- a/fs/fscache/object.c +++ b/fs/fscache/object.c @@ -314,6 +314,9 @@ void fscache_object_init(struct fscache_object *object, object->cache = cache; object->cookie = cookie; object->parent = NULL; +#ifdef CONFIG_FSCACHE_OBJECT_LIST + RB_CLEAR_NODE(&object->objlist_link); +#endif object->oob_event_mask = 0; for (t = object->oob_table; t->events; t++) |