diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2015-06-23 18:01:30 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-06-23 18:01:30 -0400 |
| commit | 8ea3a7c0df05b2cb33e2d63aa1c964308724b1c4 (patch) | |
| tree | 8fbd1ba22b5ef12c7434316b975a077aabb4cfa6 /fs/fscache/internal.h | |
| parent | a6de82cab123beaf9406024943caa0242f0618b0 (diff) | |
| parent | 4a47132ff472a0c2c5441baeb50cf97f2580bc43 (diff) | |
| download | linux-8ea3a7c0df05b2cb33e2d63aa1c964308724b1c4.tar.gz linux-8ea3a7c0df05b2cb33e2d63aa1c964308724b1c4.tar.bz2 linux-8ea3a7c0df05b2cb33e2d63aa1c964308724b1c4.zip | |
Merge branch 'fscache-fixes' into for-next
Diffstat (limited to 'fs/fscache/internal.h')
| -rw-r--r-- | fs/fscache/internal.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h index 7872a62ef30c..97ec45110957 100644 --- a/fs/fscache/internal.h +++ b/fs/fscache/internal.h @@ -124,8 +124,7 @@ extern int fscache_submit_exclusive_op(struct fscache_object *, struct fscache_operation *); extern int fscache_submit_op(struct fscache_object *, struct fscache_operation *); -extern int fscache_cancel_op(struct fscache_operation *, - void (*)(struct fscache_operation *)); +extern int fscache_cancel_op(struct fscache_operation *, bool); extern void fscache_cancel_all_ops(struct fscache_object *); extern void fscache_abort_object(struct fscache_object *); extern void fscache_start_operations(struct fscache_object *); @@ -138,8 +137,7 @@ extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *); extern int fscache_wait_for_operation_activation(struct fscache_object *, struct fscache_operation *, atomic_t *, - atomic_t *, - void (*)(struct fscache_operation *)); + atomic_t *); extern void fscache_invalidate_writes(struct fscache_cookie *); /* @@ -164,6 +162,7 @@ extern atomic_t fscache_n_op_pend; extern atomic_t fscache_n_op_run; extern atomic_t fscache_n_op_enqueue; extern atomic_t fscache_n_op_deferred_release; +extern atomic_t fscache_n_op_initialised; extern atomic_t fscache_n_op_release; extern atomic_t fscache_n_op_gc; extern atomic_t fscache_n_op_cancelled; @@ -271,6 +270,11 @@ extern atomic_t fscache_n_cop_write_page; extern atomic_t fscache_n_cop_uncache_page; extern atomic_t fscache_n_cop_dissociate_pages; +extern atomic_t fscache_n_cache_no_space_reject; +extern atomic_t fscache_n_cache_stale_objects; +extern atomic_t fscache_n_cache_retired_objects; +extern atomic_t fscache_n_cache_culled_objects; + static inline void fscache_stat(atomic_t *stat) { atomic_inc(stat); |