land v0.9.1 on HEAD, in preparation for a 1.0.x branch

[fs/lustre-release.git] / lustre / lvfs / fsfilt_reiserfs.c

diff --git a/lustre/obdclass/fsfilt_reiserfs.c b/lustre/lvfs/fsfilt_reiserfs.c
similarity index 92%
rename from lustre/obdclass/fsfilt_reiserfs.c
rename to lustre/lvfs/fsfilt_reiserfs.c
index 00a670d..c8a5d47 100644 (file)
--- a/lustre/obdclass/fsfilt_reiserfs.c
+++ b/lustre/lvfs/fsfilt_reiserfs.c
@@ -47,6 +47,7 @@
 #include <linux/obd.h>
 #include <linux/obd_class.h>
 #include <linux/module.h>
+#include <linux/init.h>
 
 static void *fsfilt_reiserfs_start(struct inode *inode, int op,
                                    void *desc_private)
@@ -140,9 +141,9 @@ static ssize_t fsfilt_reiserfs_readpage(struct file *file, char *buf, size_t cou
         return file->f_op->read(file, buf, count, offset);
 }
 
-static int fsfilt_reiserfs_set_last_rcvd(struct obd_device *obd,
-                                         __u64 last_rcvd, void *handle,
-                                         fsfilt_cb_t cb_func, void *cb_data)
+static int fsfilt_reiserfs_add_journal_cb(struct obd_device *obd,
+                                          __u64 last_rcvd, void *handle,
+                                          fsfilt_cb_t cb_func, void *cb_data)
 {
         static long next = 0;
 
@@ -156,12 +157,6 @@ static int fsfilt_reiserfs_set_last_rcvd(struct obd_device *obd,
         return 0;
 }
 
-static int fsfilt_reiserfs_journal_data(struct file *filp)
-{
-        CERROR("not implemented yet\n");
-        return 0;
-}
-
 static int fsfilt_reiserfs_statfs(struct super_block *sb, struct obd_statfs *osfs)
 {
         struct statfs sfs;
@@ -173,8 +168,7 @@ static int fsfilt_reiserfs_statfs(struct super_block *sb, struct obd_statfs *osf
 
 static int fsfilt_reiserfs_sync(struct super_block *sb)
 {
-        CERROR("not implemented yet\n");
-        return -ENOSYS;
+        return fsync_dev(sb->s_dev);
 }
 
 static struct fsfilt_operations fsfilt_reiserfs_ops = {
@@ -187,8 +181,7 @@ static struct fsfilt_operations fsfilt_reiserfs_ops = {
         fs_set_md:              fsfilt_reiserfs_set_md,
         fs_get_md:              fsfilt_reiserfs_get_md,
         fs_readpage:            fsfilt_reiserfs_readpage,
-        fs_journal_data:        fsfilt_reiserfs_journal_data,
-        fs_set_last_rcvd:       fsfilt_reiserfs_set_last_rcvd,
+        fs_add_journal_cb:      fsfilt_reiserfs_add_journal_cb,
         fs_statfs:              fsfilt_reiserfs_statfs,
         fs_sync:                fsfilt_reiserfs_sync,
 };