tomorrow we will send ~3 minor fixes that were complained about, and
then we will be ready for the next round of complaints.

To the users, the first of these two patches is very necessary, as it
has several important bug fixes (things got unsettled after the last
round of changes, apologies to users.....).

zam is working on a livelock bug fix.

Hans

--- Begin Message ---
From: Hans Reiser <[EMAIL PROTECTED]>

This patch adds Makefile to each of reiser/ subdirectories.
This is to allow compiling of a single file.

Signed-off-by: Vladimir V. Saveliev <[EMAIL PROTECTED]>


 fs/reiser4/Makefile                    |  139 ++++++++++-----------------------
 fs/reiser4/plugin/Makefile             |   26 ++++++
 fs/reiser4/plugin/compress/Makefile    |    6 +
 fs/reiser4/plugin/dir/Makefile         |    5 +
 fs/reiser4/plugin/disk_format/Makefile |    5 +
 fs/reiser4/plugin/file/Makefile        |    7 +
 fs/reiser4/plugin/item/Makefile        |   18 ++++
 fs/reiser4/plugin/node/Makefile        |    5 +
 fs/reiser4/plugin/security/Makefile    |    4 
 fs/reiser4/plugin/space/Makefile       |    4 
 10 files changed, 126 insertions(+), 93 deletions(-)

diff -puN fs/reiser4/Makefile~reiser4-fix-kbuild fs/reiser4/Makefile
--- linux-2.6.14-rc5-mm1/fs/reiser4/Makefile~reiser4-fix-kbuild 2005-11-08 
19:34:21.057312853 +0300
+++ linux-2.6.14-rc5-mm1-vs/fs/reiser4/Makefile 2005-11-08 19:34:21.089322803 
+0300
@@ -4,97 +4,50 @@
 
 obj-$(CONFIG_REISER4_FS) += reiser4.o
 
-reiser4-y := \
-                  debug.o \
-                  jnode.o \
-                  znode.o \
-                  key.o \
-                  pool.o \
-                  tree_mod.o \
-                  estimate.o \
-                  carry.o \
-                  carry_ops.o \
-                  lock.o \
-                  tree.o \
-                  context.o \
-                  tap.o \
-                  coord.o \
-                  block_alloc.o \
-                  txnmgr.o \
-                  kassign.o \
-                  flush.o \
-                  wander.o \
-                  eottl.o \
-                  search.o \
-                  page_cache.o \
-                  seal.o \
-                  dscale.o \
-                  flush_queue.o \
-                  ktxnmgrd.o \
-                  blocknrset.o \
-                  super.o \
-                  super_ops.o \
-                  fsdata.o \
-                  export_ops.o \
-                  oid.o \
-                  tree_walk.o \
-                  inode.o \
-                  vfs_ops.o \
-                  as_ops.o \
-                  emergency_flush.o \
-                  entd.o\
-                  readahead.o \
-                  cluster.o \
-                  crypt.o \
-                  status_flags.o \
-                  init_super.o \
-                  safe_link.o \
-           \
-                  plugin/plugin.o \
-                  plugin/plugin_set.o \
-                  plugin/node/node.o \
-                  plugin/object.o \
-                  plugin/inode_ops.o \
-                  plugin/inode_ops_rename.o \
-                  plugin/file_ops.o \
-                  plugin/file_ops_readdir.o \
-                  plugin/file_plugin_common.o \
-                  plugin/file/file.o \
-                  plugin/file/tail_conversion.o \
-                  plugin/file/symlink.o \
-                  plugin/file/cryptcompress.o \
-                  plugin/dir_plugin_common.o \
-                  plugin/dir/hashed_dir.o \
-                  plugin/dir/seekable_dir.o \
-                  plugin/digest.o \
-                  plugin/node/node40.o \
-           \
-                  plugin/compress/minilzo.o \
-                  plugin/compress/compress.o \
-                  plugin/compress/compress_mode.o \
-           \
-                  plugin/item/static_stat.o \
-                  plugin/item/sde.o \
-                  plugin/item/cde.o \
-                  plugin/item/blackbox.o \
-                  plugin/item/internal.o \
-                  plugin/item/tail.o \
-                  plugin/item/ctail.o \
-                  plugin/item/extent.o \
-                  plugin/item/extent_item_ops.o \
-                  plugin/item/extent_file_ops.o \
-                  plugin/item/extent_flush_ops.o \
-           \
-                  plugin/hash.o \
-                  plugin/fibration.o \
-                  plugin/tail_policy.o \
-                  plugin/item/item.o \
-           \
-                  plugin/security/perm.o \
-                  plugin/space/bitmap.o \
-           \
-                  plugin/disk_format/disk_format40.o \
-                  plugin/disk_format/disk_format.o \
-          \
-                  plugin/regular.o
+reiser4-objs :=                \
+       debug.o                 \
+       jnode.o                 \
+       znode.o                 \
+       key.o                   \
+       pool.o                  \
+       tree_mod.o              \
+       estimate.o              \
+       carry.o                 \
+       carry_ops.o             \
+       lock.o                  \
+       tree.o                  \
+       context.o               \
+       tap.o                   \
+       coord.o                 \
+       block_alloc.o           \
+       txnmgr.o                \
+       kassign.o               \
+       flush.o                 \
+       wander.o                \
+       eottl.o                 \
+       search.o                \
+       page_cache.o            \
+       seal.o                  \
+       dscale.o                \
+       flush_queue.o           \
+       ktxnmgrd.o              \
+       blocknrset.o            \
+       super.o                 \
+       super_ops.o             \
+       fsdata.o                \
+       export_ops.o            \
+       oid.o                   \
+       tree_walk.o             \
+       inode.o                 \
+       vfs_ops.o               \
+       as_ops.o                \
+       emergency_flush.o       \
+       entd.o                  \
+       readahead.o             \
+       cluster.o               \
+       crypt.o                 \
+       status_flags.o          \
+       init_super.o            \
+       safe_link.o
 
+obj-$(CONFIG_REISER4_FS) += plugin/
diff -puN /dev/null fs/reiser4/plugin/Makefile
--- /dev/null   2003-09-23 21:59:22.000000000 +0400
+++ linux-2.6.14-rc5-mm1-vs/fs/reiser4/plugin/Makefile  2005-11-08 
19:34:21.089322803 +0300
@@ -0,0 +1,26 @@
+obj-$(CONFIG_REISER4_FS) += plugins.o
+
+plugins-objs :=                        \
+       plugin.o                \
+       plugin_set.o            \
+       object.o                \
+       inode_ops.o             \
+       inode_ops_rename.o      \
+       file_ops.o              \
+       file_ops_readdir.o      \
+       file_plugin_common.o    \
+       dir_plugin_common.o     \
+       digest.o                \
+       hash.o                  \
+       fibration.o             \
+       tail_policy.o           \
+       regular.o
+
+obj-$(CONFIG_REISER4_FS) += item/
+obj-$(CONFIG_REISER4_FS) += file/
+obj-$(CONFIG_REISER4_FS) += dir/
+obj-$(CONFIG_REISER4_FS) += node/
+obj-$(CONFIG_REISER4_FS) += compress/
+obj-$(CONFIG_REISER4_FS) += space/
+obj-$(CONFIG_REISER4_FS) += disk_format/
+obj-$(CONFIG_REISER4_FS) += security/
diff -puN /dev/null fs/reiser4/plugin/compress/Makefile
--- /dev/null   2003-09-23 21:59:22.000000000 +0400
+++ linux-2.6.14-rc5-mm1-vs/fs/reiser4/plugin/compress/Makefile 2005-11-08 
19:34:21.093324047 +0300
@@ -0,0 +1,6 @@
+obj-$(CONFIG_REISER4_FS) += compress_plugins.o
+
+compress_plugins-objs :=       \
+       compress.o              \
+       minilzo.o               \
+       compress_mode.o
diff -puN /dev/null fs/reiser4/plugin/dir/Makefile
--- /dev/null   2003-09-23 21:59:22.000000000 +0400
+++ linux-2.6.14-rc5-mm1-vs/fs/reiser4/plugin/dir/Makefile      2005-11-08 
19:34:21.089322803 +0300
@@ -0,0 +1,5 @@
+obj-$(CONFIG_REISER4_FS) += dir_plugins.o
+
+dir_plugins-objs :=    \
+       hashed_dir.o    \
+       seekable_dir.o
diff -puN /dev/null fs/reiser4/plugin/disk_format/Makefile
--- /dev/null   2003-09-23 21:59:22.000000000 +0400
+++ linux-2.6.14-rc5-mm1-vs/fs/reiser4/plugin/disk_format/Makefile      
2005-11-08 19:34:21.097325291 +0300
@@ -0,0 +1,5 @@
+obj-$(CONFIG_REISER4_FS) += df_plugins.o
+
+df_plugins-objs :=     \
+       disk_format40.o \
+       disk_format.o
diff -puN /dev/null fs/reiser4/plugin/file/Makefile
--- /dev/null   2003-09-23 21:59:22.000000000 +0400
+++ linux-2.6.14-rc5-mm1-vs/fs/reiser4/plugin/file/Makefile     2005-11-08 
19:34:21.089322803 +0300
@@ -0,0 +1,7 @@
+obj-$(CONFIG_REISER4_FS) += file_plugins.o
+
+file_plugins-objs :=           \
+       file.o                  \
+       tail_conversion.o       \
+       symlink.o               \
+       cryptcompress.o
diff -puN /dev/null fs/reiser4/plugin/item/Makefile
--- /dev/null   2003-09-23 21:59:22.000000000 +0400
+++ linux-2.6.14-rc5-mm1-vs/fs/reiser4/plugin/item/Makefile     2005-11-08 
19:34:21.089322803 +0300
@@ -0,0 +1,18 @@
+obj-$(CONFIG_REISER4_FS) += item_plugins.o
+
+item_plugins-objs :=           \
+       item.o                  \
+       static_stat.o           \
+       sde.o                   \
+       cde.o                   \
+       blackbox.o              \
+       internal.o              \
+       tail.o                  \
+       ctail.o                 \
+       extent.o                \
+       extent_item_ops.o       \
+       extent_file_ops.o       \
+       extent_flush_ops.o
+
+
+
diff -puN /dev/null fs/reiser4/plugin/node/Makefile
--- /dev/null   2003-09-23 21:59:22.000000000 +0400
+++ linux-2.6.14-rc5-mm1-vs/fs/reiser4/plugin/node/Makefile     2005-11-08 
19:34:21.093324047 +0300
@@ -0,0 +1,5 @@
+obj-$(CONFIG_REISER4_FS) += node_plugins.o
+
+node_plugins-objs :=   \
+       node.o          \
+       node40.o
diff -puN /dev/null fs/reiser4/plugin/security/Makefile
--- /dev/null   2003-09-23 21:59:22.000000000 +0400
+++ linux-2.6.14-rc5-mm1-vs/fs/reiser4/plugin/security/Makefile 2005-11-08 
19:34:21.097325291 +0300
@@ -0,0 +1,4 @@
+obj-$(CONFIG_REISER4_FS) += security_plugins.o
+
+security_plugins-objs :=       \
+       perm.o
diff -puN /dev/null fs/reiser4/plugin/space/Makefile
--- /dev/null   2003-09-23 21:59:22.000000000 +0400
+++ linux-2.6.14-rc5-mm1-vs/fs/reiser4/plugin/space/Makefile    2005-11-08 
19:34:21.093324047 +0300
@@ -0,0 +1,4 @@
+obj-$(CONFIG_REISER4_FS) += space_plugins.o
+
+space_plugins-objs := \
+       bitmap.o

_

--- End Message ---

Reply via email to