diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-01 10:30:56 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-01 10:30:56 -0800 |
commit | 2883aaea363f7a897ff06d2e6c73ae7aae285bcb (patch) | |
tree | c4b53cd7231612df4a3b1ac190d205f6618bdbcd /include | |
parent | e387dc122fc7c70c2a5df2567f4e2d1114f5a5da (diff) | |
parent | e26bfebdfc0d212d366de9990a096665d5c0209a (diff) | |
download | linux-2883aaea363f7a897ff06d2e6c73ae7aae285bcb.tar.bz2 |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull fscache fixes from Al Viro.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
fscache: Fix dead object requeue
fscache: Clear outstanding writes when disabling a cookie
FS-Cache: Initialise stores_lock in netfs cookie
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/fscache-cache.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h index 13ba552e6c09..4c467ef50159 100644 --- a/include/linux/fscache-cache.h +++ b/include/linux/fscache-cache.h @@ -360,6 +360,7 @@ struct fscache_object { #define FSCACHE_OBJECT_IS_AVAILABLE 5 /* T if object has become active */ #define FSCACHE_OBJECT_RETIRED 6 /* T if object was retired on relinquishment */ #define FSCACHE_OBJECT_KILLED_BY_CACHE 7 /* T if object was killed by the cache */ +#define FSCACHE_OBJECT_RUN_AFTER_DEAD 8 /* T if object has been dispatched after death */ struct list_head cache_link; /* link in cache->object_list */ struct hlist_node cookie_link; /* link in cookie->backing_objects */ |