diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-02 23:09:08 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-03-02 23:09:08 -0500 |
| commit | 13df7977431e3b906a23bb75f29e0f40a8d73f87 (patch) | |
| tree | bc2c78c3b816a65f90c31cccebdc15b38352c045 /fs/fscache/object.c | |
| parent | 6d8b3e1ad3d3815d9c87b8553493301e243af76a (diff) | |
| parent | 0414855fdc4a40da05221fc6062cccbc0c30f169 (diff) | |
Merge 3.14-rc5 into driver-core-next
We want the fixes in here.
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, | |||
| 314 | object->cache = cache; | 314 | object->cache = cache; |
| 315 | object->cookie = cookie; | 315 | object->cookie = cookie; |
| 316 | object->parent = NULL; | 316 | object->parent = NULL; |
| 317 | #ifdef CONFIG_FSCACHE_OBJECT_LIST | ||
| 318 | RB_CLEAR_NODE(&object->objlist_link); | ||
| 319 | #endif | ||
| 317 | 320 | ||
| 318 | object->oob_event_mask = 0; | 321 | object->oob_event_mask = 0; |
| 319 | for (t = object->oob_table; t->events; t++) | 322 | for (t = object->oob_table; t->events; t++) |