Whamcloud - gitweb
- landing b_fid.
[fs/lustre-release.git] / lustre / lvfs / fsfilt_ext3.c
index e78a153..9e72149 100644 (file)
@@ -59,14 +59,17 @@ struct fsfilt_cb_data {
         struct journal_callback cb_jcb; /* jbd private data - MUST BE FIRST */
         fsfilt_cb_t cb_func;            /* MDS/OBD completion function */
         struct obd_device *cb_obd;      /* MDS/OBD completion device */
-        __u64 cb_last_rcvd;             /* MDS/OST last committed operation */
+        __u64 cb_last_num;              /* MDS/OST last committed operation */
         void *cb_data;                  /* MDS/OST completion function data */
 };
 
 #ifndef EXT3_XATTR_INDEX_TRUSTED        /* temporary until we hit l28 kernel */
 #define EXT3_XATTR_INDEX_TRUSTED        4
 #endif
+
 #define XATTR_LUSTRE_MDS_LOV_EA         "lov"
+#define XATTR_LUSTRE_MDS_MID_EA         "mid"
+#define XATTR_LUSTRE_MDS_SID_EA         "sid"
 
 /*
  * We don't currently need any additional blocks for rmdir and
@@ -310,7 +313,8 @@ static void *fsfilt_ext3_brw_start(int objcount, struct fsfilt_objinfo *fso,
         RETURN(handle);
 }
 
-static int fsfilt_ext3_commit(struct inode *inode, void *h, int force_sync)
+static int fsfilt_ext3_commit(struct super_block *sb, struct inode *inode, 
+                              void *h, int force_sync)
 {
         int rc;
         handle_t *handle = h;
@@ -440,73 +444,129 @@ static int fsfilt_ext3_iocontrol(struct inode * inode, struct file *file,
         RETURN(rc);
 }
 
+static int fsfilt_ext3_set_xattr(struct inode * inode, void *handle, char *name,
+                                 void *buffer, int buffer_size)
+{
+        int rc = 0;
+
+        lock_kernel();
+
+        rc = ext3_xattr_set_handle(handle, inode, EXT3_XATTR_INDEX_TRUSTED,
+                                   name, buffer, buffer_size, 0);
+        unlock_kernel();
+        if (rc)
+                CERROR("set xattr %s from inode %lu: rc %d\n",
+                       name,  inode->i_ino, rc);
+        return rc;
+}
+
+static int fsfilt_ext3_get_xattr(struct inode *inode, char *name,
+                                 void *buffer, int buffer_size)
+{
+        int rc = 0;
+       
+        lock_kernel();
+
+        rc = ext3_xattr_get(inode, EXT3_XATTR_INDEX_TRUSTED,
+                            name, buffer, buffer_size);
+        unlock_kernel();
+
+        if (buffer == NULL)
+                return (rc == -ENODATA) ? 0 : rc;
+        if (rc < 0) {
+                CDEBUG(D_INFO, "error getting EA %s from inode %lu: rc %d\n",
+                       name,  inode->i_ino, rc);
+                memset(buffer, 0, buffer_size);
+                return (rc == -ENODATA) ? 0 : rc;
+        }
+
+        return rc;
+}
+
 static int fsfilt_ext3_set_md(struct inode *inode, void *handle,
                               void *lmm, int lmm_size)
 {
         int rc;
 
+        LASSERT(down_trylock(&inode->i_sem) != 0);
+
         /* keep this when we get rid of OLD_EA (too noisy during conversion) */
         if (EXT3_I(inode)->i_file_acl /* || large inode EA flag */)
                 CWARN("setting EA on %lu/%u again... interesting\n",
-                       inode->i_ino, inode->i_generation);
+                      inode->i_ino, inode->i_generation);
 
-        lock_kernel();
-        rc = ext3_xattr_set_handle(handle, inode, EXT3_XATTR_INDEX_TRUSTED,
-                                   XATTR_LUSTRE_MDS_LOV_EA, lmm, lmm_size, 0);
+        rc = fsfilt_ext3_set_xattr(inode, handle, XATTR_LUSTRE_MDS_LOV_EA,
+                                   lmm, lmm_size);
+        return rc;
+}
 
-        unlock_kernel();
+/* Must be called with i_sem held */
+static int fsfilt_ext3_get_md(struct inode *inode, void *lmm, int lmm_size)
+{
+        int rc;
 
-        if (rc)
-                CERROR("error adding MD data to inode %lu: rc = %d\n",
-                       inode->i_ino, rc);
+        rc = fsfilt_ext3_get_xattr(inode, XATTR_LUSTRE_MDS_LOV_EA,
+                                   lmm, lmm_size);
+        return rc;
+}
+
+static int fsfilt_ext3_set_mid(struct inode *inode, void *handle,
+                               void *mid, int mid_size)
+{
+        int rc;
+
+        rc = fsfilt_ext3_set_xattr(inode, handle, XATTR_LUSTRE_MDS_MID_EA,
+                                   mid, mid_size);
         return rc;
 }
 
 /* Must be called with i_sem held */
-static int fsfilt_ext3_get_md(struct inode *inode, void *lmm, int lmm_size)
+static int fsfilt_ext3_get_mid(struct inode *inode, void *mid, int mid_size)
 {
         int rc;
 
-        LASSERT(down_trylock(&inode->i_sem) != 0);
-        lock_kernel();
+        rc = fsfilt_ext3_get_xattr(inode, XATTR_LUSTRE_MDS_MID_EA,
+                                   mid, mid_size);
+        return rc;
+}
 
-        rc = ext3_xattr_get(inode, EXT3_XATTR_INDEX_TRUSTED,
-                            XATTR_LUSTRE_MDS_LOV_EA, lmm, lmm_size);
-        unlock_kernel();
+static int fsfilt_ext3_set_sid(struct inode *inode, void *handle,
+                               void *sid, int sid_size)
+{
+        int rc;
 
-        /* This gives us the MD size */
-        if (lmm == NULL)
-                return (rc == -ENODATA) ? 0 : rc;
+        rc = fsfilt_ext3_set_xattr(inode, handle, XATTR_LUSTRE_MDS_SID_EA,
+                                   sid, sid_size);
+        return rc;
+}
 
-        if (rc < 0) {
-                CDEBUG(D_INFO, "error getting EA %d/%s from inode %lu: rc %d\n",
-                       EXT3_XATTR_INDEX_TRUSTED, XATTR_LUSTRE_MDS_LOV_EA,
-                       inode->i_ino, rc);
-                memset(lmm, 0, lmm_size);
-                return (rc == -ENODATA) ? 0 : rc;
-        }
+/* Must be called with i_sem held */
+static int fsfilt_ext3_get_sid(struct inode *inode, void *sid, int sid_size)
+{
+        int rc;
 
+        rc = fsfilt_ext3_get_xattr(inode, XATTR_LUSTRE_MDS_SID_EA,
+                                   sid, sid_size);
         return rc;
 }
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-static int fsfilt_ext3_send_bio(struct inode *inode, struct bio *bio)
+static int fsfilt_ext3_send_bio(int rw, struct inode *inode, struct bio *bio)
 {
-        submit_bio(WRITE, bio);
+        submit_bio(rw, bio);
         return 0;
 }
 #else
-static int fsfilt_ext3_send_bio(struct inode *inode, struct kiobuf *bio)
+static int fsfilt_ext3_send_bio(int rw, struct inode *inode, struct kiobuf *bio)
 {
         int rc, blocks_per_page;
 
-        rc = brw_kiovec(WRITE, 1, &bio, inode->i_dev,
+        rc = brw_kiovec(rw, 1, &bio, inode->i_dev,
                         bio->blocks, 1 << inode->i_blkbits);
 
         blocks_per_page = PAGE_SIZE >> inode->i_blkbits;
 
-        if (rc != (1 << inode->i_blkbits) * bio->nr_pages *
-            blocks_per_page) {
+        if (rc != (1 << inode->i_blkbits) * bio->nr_pages * blocks_per_page) {
                 CERROR("short write?  expected %d, wrote %d\n",
                        (1 << inode->i_blkbits) * bio->nr_pages *
                        blocks_per_page, rc);
@@ -600,7 +660,7 @@ static void fsfilt_ext3_cb_func(struct journal_callback *jcb, int error)
 {
         struct fsfilt_cb_data *fcb = (struct fsfilt_cb_data *)jcb;
 
-        fcb->cb_func(fcb->cb_obd, fcb->cb_last_rcvd, fcb->cb_data, error);
+        fcb->cb_func(fcb->cb_obd, fcb->cb_last_num, fcb->cb_data, error);
 
         OBD_SLAB_FREE(fcb, fcb_cache, sizeof *fcb);
         atomic_dec(&fcb_cache_count);
@@ -608,8 +668,8 @@ static void fsfilt_ext3_cb_func(struct journal_callback *jcb, int error)
 
 static int fsfilt_ext3_add_journal_cb(struct obd_device *obd,
                                       struct super_block *sb,
-                                      __u64 last_rcvd,
-                                      void *handle, fsfilt_cb_t cb_func,
+                                      __u64 last_num, void *handle,
+                                      fsfilt_cb_t cb_func,
                                       void *cb_data)
 {
         struct fsfilt_cb_data *fcb;
@@ -621,10 +681,11 @@ static int fsfilt_ext3_add_journal_cb(struct obd_device *obd,
         atomic_inc(&fcb_cache_count);
         fcb->cb_func = cb_func;
         fcb->cb_obd = obd;
-        fcb->cb_last_rcvd = last_rcvd;
+        fcb->cb_last_num = last_num;
         fcb->cb_data = cb_data;
 
-        CDEBUG(D_EXT2, "set callback for last_rcvd: "LPD64"\n", last_rcvd);
+        CDEBUG(D_EXT2, "set callback for last_num: "LPD64"\n", last_num);
+        
         lock_kernel();
         journal_callback_set(handle, fsfilt_ext3_cb_func,
                              (struct journal_callback *)fcb);
@@ -664,13 +725,65 @@ static int fsfilt_ext3_sync(struct super_block *sb)
 }
 
 #ifdef EXT3_MULTIBLOCK_ALLOCATOR
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
+#define ext3_up_truncate_sem(inode)  up_write(&EXT3_I(inode)->truncate_sem);
+#define ext3_down_truncate_sem(inode)  down_write(&EXT3_I(inode)->truncate_sem);
+#else
+#define ext3_up_truncate_sem(inode)  up(&EXT3_I(inode)->truncate_sem);
+#define ext3_down_truncate_sem(inode)  down(&EXT3_I(inode)->truncate_sem);
+#endif
+                                                                                                                                                                                                     
+#include <linux/lustre_version.h>
+#if EXT3_EXT_MAGIC == 0xf301
+#define ee_start e_start
+#define ee_block e_block
+#define ee_len   e_num
+#endif
+#ifndef EXT3_BB_MAX_BLOCKS
+#define ext3_mb_new_blocks(handle, inode, goal, count, aflags, err) \
+        ext3_new_blocks(handle, inode, count, goal, err)
+#endif
+
 struct bpointers {
         unsigned long *blocks;
         int *created;
         unsigned long start;
         int num;
         int init_num;
+        int create;
 };
+static int ext3_ext_find_goal(struct inode *inode, struct ext3_ext_path *path,
+                                unsigned long block, int *aflags)
+{
+        struct ext3_inode_info *ei = EXT3_I(inode);
+        unsigned long bg_start;
+        unsigned long colour;
+        int depth;
+                                                                                                                                                                                                     
+        if (path) {
+                struct ext3_extent *ex;
+                depth = path->p_depth;
+                                                                                                                                                                                                     
+                /* try to predict block placement */
+                if ((ex = path[depth].p_ext)) {
+                        if (ex->ee_block + ex->ee_len == block)
+                                *aflags |= 1;
+                        return ex->ee_start + (block - ex->ee_block);
+                }
+                                                                                                                                                                                                     
+                /* it looks index is empty
+                 * try to find starting from index itself */
+                if (path[depth].p_bh)
+                        return path[depth].p_bh->b_blocknr;
+        }
+                                                                                                                                                                                                     
+        /* OK. use inode's group */
+        bg_start = (ei->i_block_group * EXT3_BLOCKS_PER_GROUP(inode->i_sb)) +
+                le32_to_cpu(EXT3_SB(inode->i_sb)->s_es->s_first_data_block);
+        colour = (current->pid % 16) *
+                        (EXT3_BLOCKS_PER_GROUP(inode->i_sb) / 16);
+        return bg_start + colour + block;
+}
 
 static int ext3_ext_new_extent_cb(struct ext3_extents_tree *tree,
                                   struct ext3_ext_path *path,
@@ -683,61 +796,85 @@ static int ext3_ext_new_extent_cb(struct ext3_extents_tree *tree,
         unsigned long tgen;
         loff_t new_i_size;
         handle_t *handle;
-        int i;
-
+        int i, aflags = 0;
+                                                                                                                                                                                                     
         i = EXT_DEPTH(tree);
         EXT_ASSERT(i == path->p_depth);
         EXT_ASSERT(path[i].p_hdr);
-
+                                                                                                                                                                                                     
         if (exist) {
                 err = EXT_CONTINUE;
                 goto map;
         }
-
+                                                                                                                                                                                                     
+        if (bp->create == 0) {
+                i = 0;
+                if (newex->ee_block < bp->start)
+                        i = bp->start - newex->ee_block;
+                if (i >= newex->ee_len)
+                        CERROR("nothing to do?! i = %d, e_num = %u\n",
+                                        i, newex->ee_len);
+                for (; i < newex->ee_len && bp->num; i++) {
+                        *(bp->created) = 0;
+                        bp->created++;
+                        *(bp->blocks) = 0;
+                        bp->blocks++;
+                        bp->num--;
+                        bp->start++;
+                }
+                                                                                                                                                                                                     
+                return EXT_CONTINUE;
+        }
         tgen = EXT_GENERATION(tree);
         count = ext3_ext_calc_credits_for_insert(tree, path);
-        up_write(&EXT3_I(inode)->truncate_sem);
-
-        handle = ext3_journal_start(inode, count + EXT3_ALLOC_NEEDED + 1);
+        ext3_up_truncate_sem(inode);
+                                                                                                                                                                                                     
+        lock_kernel();
+        handle = journal_start(EXT3_JOURNAL(inode), count + EXT3_ALLOC_NEEDED + 1);
+        unlock_kernel();
         if (IS_ERR(handle)) {
-                down_write(&EXT3_I(inode)->truncate_sem);
+                ext3_down_truncate_sem(inode);
                 return PTR_ERR(handle);
         }
-
+                                                                                                                                                                                                     
         if (tgen != EXT_GENERATION(tree)) {
                 /* the tree has changed. so path can be invalid at moment */
-                ext3_journal_stop(handle, inode);
-                down_write(&EXT3_I(inode)->truncate_sem);
+                lock_kernel();
+                journal_stop(handle);
+                unlock_kernel();
+                ext3_down_truncate_sem(inode);
                 return EXT_REPEAT;
         }
-
-        down_write(&EXT3_I(inode)->truncate_sem);
-        goal = ext3_ext_find_goal(inode, path, newex->e_block);
-        count = newex->e_num;
-        pblock = ext3_new_blocks(handle, inode, &count, goal, &err);
+                                                                                                                                                                                                     
+        ext3_down_truncate_sem(inode);
+        count = newex->ee_len;
+        goal = ext3_ext_find_goal(inode, path, newex->ee_block, &aflags);
+        aflags |= 2; /* block have been already reserved */
+        pblock = ext3_mb_new_blocks(handle, inode, goal, &count, aflags, &err);
         if (!pblock)
                 goto out;
-        EXT_ASSERT(count <= newex->e_num);
-
+        EXT_ASSERT(count <= newex->ee_len);
+                                                                                                                                                                                                     
         /* insert new extent */
-        newex->e_start = pblock;
-        newex->e_num = count;
+        newex->ee_start = pblock;
+        newex->ee_len = count;
         err = ext3_ext_insert_extent(handle, tree, path, newex);
         if (err)
                 goto out;
-
+                                                                                                                                                                                                     
         /* correct on-disk inode size */
-        if (newex->e_num > 0) {
-                new_i_size = (loff_t) newex->e_block + newex->e_num;
+        if (newex->ee_len > 0) {
+                new_i_size = (loff_t) newex->ee_block + newex->ee_len;
                 new_i_size = new_i_size << inode->i_blkbits;
                 if (new_i_size > EXT3_I(inode)->i_disksize) {
                         EXT3_I(inode)->i_disksize = new_i_size;
                         err = ext3_mark_inode_dirty(handle, inode);
                 }
         }
-
 out:
-        ext3_journal_stop(handle, inode);
+        lock_kernel();
+        journal_stop(handle);
+        unlock_kernel();
 map:
         if (err >= 0) {
                 /* map blocks */
@@ -746,26 +883,27 @@ map:
                         CERROR("initial space: %lu:%u\n",
                                 bp->start, bp->init_num);
                         CERROR("current extent: %u/%u/%u %d\n",
-                                newex->e_block, newex->e_num,
-                                newex->e_start, exist);
+                                newex->ee_block, newex->ee_len,
+                                newex->ee_start, exist);
                 }
                 i = 0;
-                if (newex->e_block < bp->start)
-                        i = bp->start - newex->e_block;
-                if (i >= newex->e_num)
+                if (newex->ee_block < bp->start)
+                        i = bp->start - newex->ee_block;
+                if (i >= newex->ee_len)
                         CERROR("nothing to do?! i = %d, e_num = %u\n",
-                                        i, newex->e_num);
-                for (; i < newex->e_num && bp->num; i++) {
+                                        i, newex->ee_len);
+                for (; i < newex->ee_len && bp->num; i++) {
                         *(bp->created) = (exist == 0 ? 1 : 0);
                         bp->created++;
-                        *(bp->blocks) = newex->e_start + i;
+                        *(bp->blocks) = newex->ee_start + i;
                         bp->blocks++;
                         bp->num--;
+                        bp->start++;
                 }
         }
         return err;
 }
-
+                                                                                                                                                                                                     
 int fsfilt_map_nblocks(struct inode *inode, unsigned long block,
                        unsigned long num, unsigned long *blocks,
                        int *created, int create)
@@ -773,22 +911,23 @@ int fsfilt_map_nblocks(struct inode *inode, unsigned long block,
         struct ext3_extents_tree tree;
         struct bpointers bp;
         int err;
-
+                                                                                                                                                                                                     
         CDEBUG(D_OTHER, "blocks %lu-%lu requested for inode %u\n",
                 block, block + num, (unsigned) inode->i_ino);
-
+                                                                                                                                                                                                     
         ext3_init_tree_desc(&tree, inode);
         tree.private = &bp;
         bp.blocks = blocks;
         bp.created = created;
         bp.start = block;
         bp.init_num = bp.num = num;
-
-        down_write(&EXT3_I(inode)->truncate_sem);
+        bp.create = create;
+                                                                                                                                                                                                     
+        ext3_down_truncate_sem(inode);
         err = ext3_ext_walk_space(&tree, block, num, ext3_ext_new_extent_cb);
         ext3_ext_invalidate_cache(&tree);
-        up_write(&EXT3_I(inode)->truncate_sem);
-
+        ext3_up_truncate_sem(inode);
+                                                                                                                                                                                                     
         return err;
 }
 
@@ -954,7 +1093,7 @@ static int fsfilt_ext3_write_record(struct file *file, void *buf, int bufsize,
         loff_t new_size = inode->i_size;
         journal_t *journal;
         handle_t *handle;
-        int err, block_count = 0, blocksize, size, boffs;
+        int err = 0, block_count = 0, blocksize, size, boffs;
 
         /* Determine how many transaction credits are needed */
         blocksize = 1 << inode->i_blkbits;
@@ -1085,19 +1224,27 @@ extern int ext3_add_dir_entry(struct dentry *dentry);
 extern int ext3_del_dir_entry(struct dentry *dentry);
 
 static int fsfilt_ext3_add_dir_entry(struct obd_device *obd,
-                                 struct dentry *parent,
-                                 char *name, int namelen,
-                                 unsigned long ino,
-                                 unsigned long generation,
-                                 unsigned mds)
+                                     struct dentry *parent,
+                                     char *name, int namelen,
+                                     unsigned long ino,
+                                     unsigned long generation,
+                                     unsigned long mds, 
+                                     unsigned long fid)
 {
 #ifdef EXT3_FEATURE_INCOMPAT_MDSNUM
         struct dentry *dentry;
         int err;
+        LASSERT(ino != 0);
+        LASSERT(namelen != 0);
         dentry = ll_lookup_one_len(name, parent, namelen);
-        if (IS_ERR(dentry))
+        if (IS_ERR(dentry)) {
+                CERROR("can't lookup %*s in %lu/%lu: %d\n", dentry->d_name.len,
+                       dentry->d_name.name, dentry->d_inode->i_ino,
+                       (unsigned long) dentry->d_inode->i_generation,
+                       (int) PTR_ERR(dentry));
                 RETURN(PTR_ERR(dentry));
-        if (dentry->d_inode != NULL) {
+        }
+        if (dentry->d_inode != NULL || dentry->d_flags & DCACHE_CROSS_REF) {
                 CERROR("dentry %*s(0x%p) found\n", dentry->d_name.len,
                        dentry->d_name.name, dentry);
                 l_dput(dentry);
@@ -1113,6 +1260,7 @@ static int fsfilt_ext3_add_dir_entry(struct obd_device *obd,
         dentry->d_inum = ino;
         dentry->d_mdsnum = mds;
         dentry->d_generation = generation;
+        dentry->d_fid = fid;
         lock_kernel();
         err = ext3_add_dir_entry(dentry);
         unlock_kernel();
@@ -1143,45 +1291,6 @@ static int fsfilt_ext3_del_dir_entry(struct obd_device *obd,
 #endif
 }
 
-static int fsfilt_ext3_set_xattr(struct inode * inode, void *handle, char *name,
-                                 void *buffer, int buffer_size)
-{
-        int rc = 0;
-
-        lock_kernel();
-
-        rc = ext3_xattr_set_handle(handle, inode, EXT3_XATTR_INDEX_TRUSTED,
-                                   name, buffer, buffer_size, 0);
-        unlock_kernel();
-        if (rc)
-                CERROR("set xattr %s from inode %lu: rc %d\n",
-                       name,  inode->i_ino, rc);
-        return rc;
-}
-
-static int fsfilt_ext3_get_xattr(struct inode *inode, char *name,
-                                 void *buffer, int buffer_size)
-{
-        int rc = 0;
-       
-        lock_kernel();
-
-        rc = ext3_xattr_get(inode, EXT3_XATTR_INDEX_TRUSTED,
-                            name, buffer, buffer_size);
-        unlock_kernel();
-
-        if (buffer == NULL)
-                return (rc == -ENODATA) ? 0 : rc;
-        if (rc < 0) {
-                CDEBUG(D_INFO, "error getting EA %s from inode %lu: rc %d\n",
-                       name,  inode->i_ino, rc);
-                memset(buffer, 0, buffer_size);
-                return (rc == -ENODATA) ? 0 : rc;
-        }
-
-        return rc;
-}
-
 /* 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_ext3_get_op_len(int op, struct fsfilt_objinfo *fso, int logs)
@@ -1217,6 +1326,11 @@ static int fsfilt_ext3_get_op_len(int op, struct fsfilt_objinfo *fso, int logs)
 #define EXTENTS_EA "write_extents"
 #define EXTENTS_EA_SIZE 64
 
+int ext3_ext_in_ea_alloc_space(struct inode *, int, const char *, unsigned long, unsigned long);
+int ext3_ext_in_ea_remove_space(struct inode *, int, const char *, unsigned long, unsigned long);
+int ext3_ext_in_ea_get_extents(struct inode *, int, const char *, char **, int *);
+int ext3_ext_in_ea_get_extents_num(struct inode *, int, const char *, int *);
+
 static int fsfilt_ext3_insert_extents_ea(struct inode *inode, 
                                       unsigned long from, 
                                       unsigned long num) 
@@ -1271,33 +1385,37 @@ static int fsfilt_ext3_get_write_extents_num(struct inode *inode, int *size)
 } 
 
 static struct fsfilt_operations fsfilt_ext3_ops = {
-        .fs_type                = "ext3",
-        .fs_owner               = THIS_MODULE,
-        .fs_start               = fsfilt_ext3_start,
-        .fs_brw_start           = fsfilt_ext3_brw_start,
-        .fs_commit              = fsfilt_ext3_commit,
-        .fs_commit_async        = fsfilt_ext3_commit_async,
-        .fs_commit_wait         = fsfilt_ext3_commit_wait,
-        .fs_setattr             = fsfilt_ext3_setattr,
-        .fs_iocontrol           = fsfilt_ext3_iocontrol,
-        .fs_set_md              = fsfilt_ext3_set_md,
-        .fs_get_md              = fsfilt_ext3_get_md,
-        .fs_readpage            = fsfilt_ext3_readpage,
-        .fs_add_journal_cb      = fsfilt_ext3_add_journal_cb,
-        .fs_statfs              = fsfilt_ext3_statfs,
-        .fs_sync                = fsfilt_ext3_sync,
-        .fs_map_inode_pages     = fsfilt_ext3_map_inode_pages,
-        .fs_prep_san_write      = fsfilt_ext3_prep_san_write,
-        .fs_write_record        = fsfilt_ext3_write_record,
-        .fs_read_record         = fsfilt_ext3_read_record,
-        .fs_setup               = fsfilt_ext3_setup,
-        .fs_getpage             = fsfilt_ext3_getpage,
-        .fs_send_bio            = fsfilt_ext3_send_bio,
-        .fs_set_xattr           = fsfilt_ext3_set_xattr,
-        .fs_get_xattr           = fsfilt_ext3_get_xattr,
-        .fs_get_op_len          = fsfilt_ext3_get_op_len,
-        .fs_add_dir_entry       = fsfilt_ext3_add_dir_entry,
-        .fs_del_dir_entry       = fsfilt_ext3_del_dir_entry,
+        .fs_type                    = "ext3",
+        .fs_owner                   = THIS_MODULE,
+        .fs_start                   = fsfilt_ext3_start,
+        .fs_brw_start               = fsfilt_ext3_brw_start,
+        .fs_commit                  = fsfilt_ext3_commit,
+        .fs_commit_async            = fsfilt_ext3_commit_async,
+        .fs_commit_wait             = fsfilt_ext3_commit_wait,
+        .fs_setattr                 = fsfilt_ext3_setattr,
+        .fs_iocontrol               = fsfilt_ext3_iocontrol,
+        .fs_set_md                  = fsfilt_ext3_set_md,
+        .fs_get_md                  = fsfilt_ext3_get_md,
+        .fs_set_mid                 = fsfilt_ext3_set_mid,
+        .fs_get_mid                 = fsfilt_ext3_get_mid,
+        .fs_set_sid                 = fsfilt_ext3_set_sid,
+        .fs_get_sid                 = fsfilt_ext3_get_sid,
+        .fs_readpage                = fsfilt_ext3_readpage,
+        .fs_add_journal_cb          = fsfilt_ext3_add_journal_cb,
+        .fs_statfs                  = fsfilt_ext3_statfs,
+        .fs_sync                    = fsfilt_ext3_sync,
+        .fs_map_inode_pages         = fsfilt_ext3_map_inode_pages,
+        .fs_prep_san_write          = fsfilt_ext3_prep_san_write,
+        .fs_write_record            = fsfilt_ext3_write_record,
+        .fs_read_record             = fsfilt_ext3_read_record,
+        .fs_setup                   = fsfilt_ext3_setup,
+        .fs_getpage                 = fsfilt_ext3_getpage,
+        .fs_send_bio                = fsfilt_ext3_send_bio,
+        .fs_set_xattr               = fsfilt_ext3_set_xattr,
+        .fs_get_xattr               = fsfilt_ext3_get_xattr,
+        .fs_get_op_len              = fsfilt_ext3_get_op_len,
+        .fs_add_dir_entry           = fsfilt_ext3_add_dir_entry,
+        .fs_del_dir_entry           = fsfilt_ext3_del_dir_entry,
         .fs_init_extents_ea         = fsfilt_ext3_init_extents_ea,
         .fs_insert_extents_ea       = fsfilt_ext3_insert_extents_ea,
         .fs_remove_extents_ea       = fsfilt_ext3_remove_extents_ea,
@@ -1327,15 +1445,10 @@ out:
 
 static void __exit fsfilt_ext3_exit(void)
 {
-        int rc;
-
         fsfilt_unregister_ops(&fsfilt_ext3_ops);
-        rc = kmem_cache_destroy(fcb_cache);
-
-        if (rc || atomic_read(&fcb_cache_count)) {
-                CERROR("can't free fsfilt callback cache: count %d, rc = %d\n",
-                       atomic_read(&fcb_cache_count), rc);
-        }
+        LASSERTF(kmem_cache_destroy(fcb_cache) == 0,
+                 "can't free fsfilt callback cache: count %d\n",
+                 atomic_read(&fcb_cache_count));
 }
 
 module_init(fsfilt_ext3_init);