reiser4-rename-cluster-files.patch]
PATCH 3/8 reiser4-rename-cluster-files.patch]
.
From: Edward Shishkin <[email protected]>
This patch moves several files within reiser4/.
Signed-off-by Vladimir V. Saveliev <[email protected]>
fs/reiser4/Makefile | 7 fs/reiser4/estimate.c | 2 fs/reiser4/flush.h | 2 fs/reiser4/plugin/cluster.c | 66 ++++++ fs/reiser4/plugin/cluster.h | 327 +++++++++++++++++++++++++++++++++ fs/reiser4/plugin/crypto/cipher.c | 115 +++++++++++ fs/reiser4/plugin/crypto/cipher.h | 58 +++++ fs/reiser4/plugin/crypto/digest.c | 58 +++++ fs/reiser4/plugin/file/cryptcompress.c | 2 fs/reiser4/plugin/file/cryptcompress.h | 2 fs/reiser4/plugin/item/ctail.c | 2 fs/reiser4/plugin/plugin.h | 2 fs/reiser4/cluster.c | 66 ------ fs/reiser4/cluster.h | 327 --------------------------------- fs/reiser4/crypt.c | 115 ----------- fs/reiser4/crypt.h | 58 ----- fs/reiser4/plugin/digest.c | 58 ----- 17 files changed, 634 insertions(+), 633 deletions(-)
fs/reiser4/Makefile renamed from fs/reiser4/Makefile~reiser4-rename-cluster-files +4 -3
@@ -44,8 +44,6 @@ reiser4-y := \ emergency_flush.o \ entd.o\ readahead.o \ - cluster.o \ - crypt.o \ status_flags.o \ init_super.o \ safe_link.o \
@@ -54,6 +52,7 @@ reiser4-y := \ plugin/plugin_set.o \ plugin/node/node.o \ plugin/object.o \ + plugin/cluster.o \ plugin/inode_ops.o \ plugin/inode_ops_rename.o \ plugin/file_ops.o \
@@ -66,9 +65,11 @@ reiser4-y := \ plugin/dir_plugin_common.o \ plugin/dir/hashed_dir.o \ plugin/dir/seekable_dir.o \ - plugin/digest.o \ plugin/node/node40.o \ \ + plugin/crypto/cipher.o \ + plugin/crypto/digest.o \ + \ plugin/compress/minilzo.o \ plugin/compress/compress.o \ plugin/compress/compress_mode.o \
fs/reiser4/cluster.c deleted +0 -66
66 lines not on this page · raw message
fs/reiser4/cluster.h deleted +0 -327
327 lines not on this page · raw message
fs/reiser4/crypt.c deleted +0 -115
115 lines not on this page · raw message
fs/reiser4/crypt.h deleted +0 -58
58 lines not on this page · raw message
fs/reiser4/estimate.c renamed from fs/reiser4/estimate.c~reiser4-rename-cluster-files +1 -1
@@ -5,7 +5,7 @@#include "tree.h" #include "carry.h" #include "inode.h" -#include "cluster.h" +#include "plugin/cluster.h" #include "plugin/item/ctail.h" /* this returns how many nodes might get dirty and added nodes if @children nodes are dirtied
fs/reiser4/flush.h renamed from fs/reiser4/flush.h~reiser4-rename-cluster-files +1 -1
@@ -5,7 +5,7 @@#if !defined(__REISER4_FLUSH_H__)#define __REISER4_FLUSH_H__ -#include "cluster.h" +#include "plugin/cluster.h" /* The flush_scan data structure maintains the state of an in-progress flush-scan on a single level of the tree. A flush-scan is used for counting the number of adjacent
fs/reiser4/plugin/cluster.c new file +66 -0
66 lines not on this page · raw message
fs/reiser4/plugin/cluster.h new file +327 -0
327 lines not on this page · raw message
fs/reiser4/plugin/crypto/cipher.c new file +115 -0
115 lines not on this page · raw message
fs/reiser4/plugin/crypto/cipher.h new file +58 -0
58 lines not on this page · raw message
fs/reiser4/plugin/crypto/digest.c new file +58 -0
58 lines not on this page · raw message
fs/reiser4/plugin/digest.c deleted +0 -58
58 lines not on this page · raw message
fs/reiser4/plugin/file/cryptcompress.c renamed from fs/reiser4/plugin/file/cryptcompress.c~reiser4-rename-cluster-files +1 -1
@@ -5,7 +5,7 @@#include "../../page_cache.h" #include "../../inode.h" -#include "../../cluster.h" +#include "../cluster.h" #include "../object.h" #include "../../tree_walk.h" #include "funcs.h"
fs/reiser4/plugin/file/cryptcompress.h renamed from fs/reiser4/plugin/file/cryptcompress.h~reiser4-rename-cluster-files +1 -1
@@ -5,7 +5,7 @@#define __FS_REISER4_CRYPTCOMPRESS_H__#include "../compress/compress.h" -#include "../../crypt.h" +#include "../crypto/cipher.h" #include <linux/pagemap.h> #include <linux/vmalloc.h>
fs/reiser4/plugin/item/ctail.c renamed from fs/reiser4/plugin/item/ctail.c~reiser4-rename-cluster-files +1 -1
@@ -30,7 +30,7 @@ Internal on-disk structure:#include "../../super.h" #include "../../context.h" #include "../../page_cache.h" -#include "../../cluster.h" +#include "../cluster.h" #include "../../flush.h" #include "../../tree_walk.h" #include "../file/funcs.h"
fs/reiser4/plugin/plugin.h renamed from fs/reiser4/plugin/plugin.h~reiser4-rename-cluster-files +1 -1
@@ -11,7 +11,7 @@#include "../dformat.h" #include "../key.h" #include "compress/compress.h" -#include "../crypt.h" +#include "crypto/cipher.h" #include "plugin_header.h" #include "item/static_stat.h" #include "item/internal.h"
_