update from HEAD

diff --git a/lustre/obdclass/llog_test.c b/lustre/obdclass/llog_test.c
index 476717c..35da39a 100644 (file)
--- a/lustre/obdclass/llog_test.c
+++ b/lustre/obdclass/llog_test.c
@@ -606,6 +606,10 @@ static int llog_test_setup(struct obd_device *obd, obd_count len, void *buf)
         RETURN(rc);
 }
 
+static struct lprocfs_vars lprocfs_ost_obd_vars[] = { {0} };
+static struct lprocfs_vars lprocfs_ost_module_vars[] = { {0} };
+LPROCFS_INIT_VARS(ost, lprocfs_ost_module_vars, lprocfs_ost_obd_vars)
+
 static int llog_test_attach(struct obd_device *dev, obd_count len, void *data)
 {
         struct lprocfs_static_vars lvars;
@@ -630,11 +634,15 @@ static struct obd_ops llog_obd_ops = {
 
 };
 
+static struct lprocfs_vars lprocfs_obd_vars[] = { {0} };
+static struct lprocfs_vars lprocfs_module_vars[] = { {0} };
+LPROCFS_INIT_VARS(llog_test, lprocfs_module_vars, lprocfs_obd_vars)
+
 static int __init llog_test_init(void)
 {
         struct lprocfs_static_vars lvars;
 
-        lprocfs_init_multi_vars(0, &lvars);
+        lprocfs_init_vars(llog_test, &lvars);
         return class_register_type(&llog_obd_ops,lvars.module_vars,"llog_test");
 }
 

diff --git a/lustre/obdfilter/filter_io_24.c b/lustre/obdfilter/filter_io_24.c
index 4129a09..84d536b 100644 (file)
--- a/lustre/obdfilter/filter_io_24.c
+++ b/lustre/obdfilter/filter_io_24.c
@@ -249,7 +249,8 @@ int filter_commitrw_write(struct obd_export *exp, struct obdo *oa, int objcount,
         cleanup_phase = 2;
 
         down(&inode->i_sem);
-        oti->oti_handle = fsfilt_brw_start(obd, objcount, &fso, niocount, oti);
+        oti->oti_handle = fsfilt_brw_start(obd, objcount, &fso, niocount, res,
+                                           oti);
         if (IS_ERR(oti->oti_handle)) {
                 rc = PTR_ERR(oti->oti_handle);
                 CDEBUG(rc == -ENOSPC ? D_INODE : D_ERROR,