merge devel zcfg

This merge broke config llog, so this branch doesn't mount right now:

llog_write_rec()) ASSERTION((buflen %% LLOG_MIN_REC_SIZE) == 0)

diff --git a/lustre/obdfilter/filter_io_26.c b/lustre/obdfilter/filter_io_26.c
index e522962..87b06df 100644 (file)
--- a/lustre/obdfilter/filter_io_26.c
+++ b/lustre/obdfilter/filter_io_26.c
@@ -35,6 +35,8 @@
 #include <linux/lustre_fsfilt.h>
 #include "filter_internal.h"
 
+#warning "implement writeback mode -bzzz"
+
 int ext3_map_inode_page(struct inode *inode, struct page *page,
                         unsigned long *blocks, int *created, int create);