[Devel,RHEL7,COMMIT] fs: Revert "MS/FS/DCACHE: move vfs caches to headers"

Submitted by Konstantin Khorenko on Aug. 7, 2017, 10:47 a.m.

Details

Message ID 201708071047.v77AlZtX008285@finist_cl7.x64_64.work.ct
State New
Series "fs: Revert "MS/FS/DCACHE: move vfs caches to headers""
Headers show

Commit Message

Konstantin Khorenko Aug. 7, 2017, 10:47 a.m.
The commit is pushed to "branch-rh7-3.10.0-514.26.1.vz7.35.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-514.26.1.vz7.33.22
------>
commit ca5fda64277d7f77d195aecf61a6ab85519741c8
Author: Kirill Tkhai <ktkhai@virtuozzo.com>
Date:   Mon Aug 7 14:47:34 2017 +0400

    fs: Revert "MS/FS/DCACHE: move vfs caches to headers"
    
    This reverts commit c66a040 ("MS/FS/DCACHE: move vfs caches to headers"), which
    is leftover from vz6 and it's not need anymore.
    
    After the commit, dentry_cache will be statically declared again.
    
    Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
 fs/dcache.c            | 2 +-
 include/linux/dcache.h | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/fs/dcache.c b/fs/dcache.c
index 9a8b6f3..aa14904 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -92,7 +92,7 @@  __cacheline_aligned_in_smp DEFINE_SEQLOCK(rename_lock);
 
 EXPORT_SYMBOL(rename_lock);
 
-struct kmem_cache *dentry_cache __read_mostly;
+static struct kmem_cache *dentry_cache __read_mostly;
 
 /*
  * This is the single most critical data structure when it comes
diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index 8da0f76..13cb1ec 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -133,8 +133,6 @@  struct dentry {
 	struct hlist_node d_alias;	/* inode alias list */
 };
 
-extern struct kmem_cache *dentry_cache;
-
 /*
  * dentry->d_lock spinlock nesting subclasses:
  *