aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/ceph/libceph.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2018-06-04 13:33:12 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2018-06-04 13:33:12 -0700
commitc13aca79ff3c4af5fd31a5b2743a90eba6e36a26 (patch)
tree8f77894f61822d1ae5285c07c801af7c62f71afd /include/linux/ceph/libceph.h
parent40f7090bb1b4ec327ea1e1402ff5783af5b35195 (diff)
parent5ca4d1ae9bad0f59bd6f851c39b19f5366953666 (diff)
downloadkernel_replicant_linux-c13aca79ff3c4af5fd31a5b2743a90eba6e36a26.tar.gz
kernel_replicant_linux-c13aca79ff3c4af5fd31a5b2743a90eba6e36a26.tar.bz2
kernel_replicant_linux-c13aca79ff3c4af5fd31a5b2743a90eba6e36a26.zip
Merge branch 'next' into for-linus
Prepare input updates for 4.18 merge window.
Diffstat (limited to 'include/linux/ceph/libceph.h')
-rw-r--r--include/linux/ceph/libceph.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h
index c2ec44cf5098..49c93b9308d7 100644
--- a/include/linux/ceph/libceph.h
+++ b/include/linux/ceph/libceph.h
@@ -262,6 +262,7 @@ extern struct kmem_cache *ceph_cap_cachep;
extern struct kmem_cache *ceph_cap_flush_cachep;
extern struct kmem_cache *ceph_dentry_cachep;
extern struct kmem_cache *ceph_file_cachep;
+extern struct kmem_cache *ceph_dir_file_cachep;
/* ceph_common.c */
extern bool libceph_compatible(void *data);