- make HEAD from b_post_cmd3

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

diff --git a/lustre/lvfs/fsfilt_reiserfs.c b/lustre/lvfs/fsfilt_reiserfs.c
index 2e16c18..684afe9 100644 (file)
--- a/lustre/lvfs/fsfilt_reiserfs.c
+++ b/lustre/lvfs/fsfilt_reiserfs.c
@@ -33,7 +33,6 @@
 #define DEBUG_SUBSYSTEM S_FILTER
 
 #include <linux/fs.h>
-#include <linux/jbd.h>
 #include <linux/slab.h>
 #include <linux/pagemap.h>
 #include <linux/quotaops.h>
@@ -42,22 +41,29 @@
 #include <linux/init.h>
 #include <asm/statfs.h>
 #endif
-#include <linux/kp30.h>
-#include <linux/lustre_fsfilt.h>
-#include <linux/obd.h>
-#include <linux/obd_class.h>
+#include <libcfs/kp30.h>
+#include <lustre_fsfilt.h>
+#include <obd.h>
+#include <obd_class.h>
 #include <linux/module.h>
 #include <linux/init.h>
 
+/* XXX We cannot include linux/reiserfs_fs.h here, because of symbols clash,
+   but we need MAX_HEIGHT definition for proper reserve calculations
+#include <linux/reiserfs_fs.h>
+*/
+#define MAX_HEIGHT 5 /* maximal height of a tree. don't change this without
+                        changing JOURNAL_PER_BALANCE_CNT */
+
 static void *fsfilt_reiserfs_start(struct inode *inode, int op,
-                                   void *desc_private)
+                                   void *desc_private, int logs)
 {
         return (void *)0xf00f00be;
 }
 
 static void *fsfilt_reiserfs_brw_start(int objcount, struct fsfilt_objinfo *fso,
                                        int niocount, struct niobuf_local *nb,
-                                       void *desc_private)
+                                       void *desc_private, int logs)
 {
         return (void *)0xf00f00be;
 }
@@ -119,7 +125,7 @@ static int fsfilt_reiserfs_setattr(struct dentry *dentry, void *handle,
 }
 
 static int fsfilt_reiserfs_set_md(struct inode *inode, void *handle,
-                                  void *lmm, int lmm_size)
+                                  void *lmm, int lmm_size, const char *name)
 {
         /* XXX write stripe data into MDS file itself */
         CERROR("not implemented yet\n");
@@ -127,7 +133,8 @@ static int fsfilt_reiserfs_set_md(struct inode *inode, void *handle,
         return -ENOSYS;
 }
 
-static int fsfilt_reiserfs_get_md(struct inode *inode, void *lmm, int lmm_size)
+static int fsfilt_reiserfs_get_md(struct inode *inode, void *lmm, int lmm_size,
+                                  const char *name)
 {
         if (lmm == NULL)
                 return inode->i_size;
@@ -158,10 +165,15 @@ static int fsfilt_reiserfs_add_journal_cb(struct obd_device *obd,
         return 0;
 }
 
-static int fsfilt_reiserfs_statfs(struct super_block *sb, struct obd_statfs *osfs)
+static int fsfilt_reiserfs_statfs(struct super_block *sb,
+                                  struct obd_statfs *osfs)
 {
-        struct statfs sfs;
-        int rc = vfs_statfs(sb, &sfs);
+        struct kstatfs sfs;
+        int rc;
+
+        memset(&sfs, 0, sizeof(sfs));
+
+        rc = ll_do_statfs(sb, &sfs);
 
         statfs_pack(osfs, &sfs);
         return rc;
@@ -172,19 +184,49 @@ static int fsfilt_reiserfs_sync(struct super_block *sb)
         return fsync_dev(sb->s_dev);
 }
 
+/* If fso is NULL, op is FSFILT operation, otherwise op is number of fso
+   objects. Logs is number of logfiles to update */
+static int fsfilt_reiserfs_get_op_len(int op, struct fsfilt_objinfo *fso,
+                                      int logs)
+{
+        if ( !fso ) {
+                switch(op) {
+                case FSFILT_OP_CREATE:
+                                 /* directory leaf, index & indirect & EA*/
+                        return MAX_HEIGHT + logs;
+                case FSFILT_OP_UNLINK:
+                        return MAX_HEIGHT + logs;
+                }
+
+        } else {
+                int i;
+                int needed = MAX_HEIGHT;
+                struct super_block *sb = fso->fso_dentry->d_inode->i_sb;
+                int blockpp = 1 << (CFS_PAGE_SHIFT - sb->s_blocksize_bits);
+                for (i = 0; i < op; i++, fso++) {
+                        int nblocks = fso->fso_bufcnt * blockpp;
+
+                        needed += nblocks;
+                }
+                return needed + logs;
+        }
+
+        return 0;
+}
 static struct fsfilt_operations fsfilt_reiserfs_ops = {
-        fs_type:                "reiserfs",
-        fs_owner:               THIS_MODULE,
-        fs_start:               fsfilt_reiserfs_start,
-        fs_brw_start:           fsfilt_reiserfs_brw_start,
-        fs_commit:              fsfilt_reiserfs_commit,
-        fs_setattr:             fsfilt_reiserfs_setattr,
-        fs_set_md:              fsfilt_reiserfs_set_md,
-        fs_get_md:              fsfilt_reiserfs_get_md,
-        fs_readpage:            fsfilt_reiserfs_readpage,
-        fs_add_journal_cb:      fsfilt_reiserfs_add_journal_cb,
-        fs_statfs:              fsfilt_reiserfs_statfs,
-        fs_sync:                fsfilt_reiserfs_sync,
+        .fs_type                = "reiserfs",
+        .fs_owner               = THIS_MODULE,
+        .fs_start               = fsfilt_reiserfs_start,
+        .fs_brw_start           = fsfilt_reiserfs_brw_start,
+        .fs_commit              = fsfilt_reiserfs_commit,
+        .fs_setattr             = fsfilt_reiserfs_setattr,
+        .fs_set_md              = fsfilt_reiserfs_set_md,
+        .fs_get_md              = fsfilt_reiserfs_get_md,
+        .fs_readpage            = fsfilt_reiserfs_readpage,
+        .fs_add_journal_cb      = fsfilt_reiserfs_add_journal_cb,
+        .fs_statfs              = fsfilt_reiserfs_statfs,
+        .fs_sync                = fsfilt_reiserfs_sync,
+        .fs_get_op_len          = fsfilt_reiserfs_get_op_len,
 };
 
 static int __init fsfilt_reiserfs_init(void)