From 69a4711bc53d2e2962f3ebd01813d1eb9447d4dd Mon Sep 17 00:00:00 2001
From: pschwan <pschwan>
Date: Sun, 6 Jul 2003 18:49:27 +0000
Subject: [PATCH] b=1141 A reorganization of obdfilter/ before I launch into
 the real work. There should be no functional changes.  - removes unused
 'niobuf_remote' argument from fsfilt_brw_start  - splits filter.c into
 filter.c, filter_io.c, filter_log.c, and filter_san.c    More of the same is
 on the way, but this is a good start.

---
 lustre/include/linux/lustre_fsfilt.h | 6 ++----
 lustre/obdclass/fsfilt_ext3.c        | 9 +++------
 lustre/obdclass/fsfilt_reiserfs.c    | 5 ++---
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/lustre/include/linux/lustre_fsfilt.h b/lustre/include/linux/lustre_fsfilt.h
index bc342e4..4523af7 100644
--- a/lustre/include/linux/lustre_fsfilt.h
+++ b/lustre/include/linux/lustre_fsfilt.h
@@ -44,8 +44,7 @@ struct fsfilt_operations {
         char   *fs_type;
         void   *(* fs_start)(struct inode *inode, int op, void *desc_private);
         void   *(* fs_brw_start)(int objcount, struct fsfilt_objinfo *fso,
-                                 int niocount, struct niobuf_remote *nb,
-                                 void *desc_private);
+                                 int niocount, void *desc_private);
         int     (* fs_commit)(struct inode *inode, void *handle,int force_sync);
         int     (* fs_setattr)(struct dentry *dentry, void *handle,
                                struct iattr *iattr, int do_trunc);
@@ -105,14 +104,13 @@ static inline void *fsfilt_start(struct obd_device *obd, struct inode *inode,
 
 static inline void *fsfilt_brw_start(struct obd_device *obd, int objcount,
                                      struct fsfilt_objinfo *fso, int niocount,
-                                     struct niobuf_remote *nb,
                                      struct obd_trans_info *oti)
 {
         unsigned long now = jiffies;
         void *parent_handle = oti ? oti->oti_handle : NULL;
         void *handle;
 
-        handle = obd->obd_fsops->fs_brw_start(objcount, fso, niocount, nb,
+        handle = obd->obd_fsops->fs_brw_start(objcount, fso, niocount,
                                               parent_handle);
         CDEBUG(D_HA, "started handle %p (%p)\n", handle, parent_handle);
 
diff --git a/lustre/obdclass/fsfilt_ext3.c b/lustre/obdclass/fsfilt_ext3.c
index 2488c70..a9fd357 100644
--- a/lustre/obdclass/fsfilt_ext3.c
+++ b/lustre/obdclass/fsfilt_ext3.c
@@ -197,8 +197,7 @@ static int fsfilt_ext3_credits_needed(int objcount, struct fsfilt_objinfo *fso)
  * the pages have been written.
  */
 static void *fsfilt_ext3_brw_start(int objcount, struct fsfilt_objinfo *fso,
-                                   int niocount, struct niobuf_remote *nb,
-                                   void *desc_private)
+                                   int niocount, void *desc_private)
 {
         journal_t *journal;
         handle_t *handle;
@@ -264,16 +263,14 @@ static int fsfilt_ext3_setattr(struct dentry *dentry, void *handle,
          * in the block pointers; this is really the "small" stripe MD data.
          * We can avoid further hackery by virtue of the MDS file size being
          * zero all the time (which doesn't invoke block truncate at unlink
-         * time), so we assert we never change the MDS file size from zero.
-         */
+         * time), so we assert we never change the MDS file size from zero. */
         if (iattr->ia_valid & ATTR_SIZE && !do_trunc) {
                 /* ATTR_SIZE would invoke truncate: clear it */
                 iattr->ia_valid &= ~ATTR_SIZE;
                 inode->i_size = iattr->ia_size;
 
                 /* make sure _something_ gets set - so new inode
-                 * goes to disk (probably won't work over XFS
-                 */
+                 * goes to disk (probably won't work over XFS */
                 if (!iattr->ia_valid & ATTR_MODE) {
                         iattr->ia_valid |= ATTR_MODE;
                         iattr->ia_mode = inode->i_mode;
diff --git a/lustre/obdclass/fsfilt_reiserfs.c b/lustre/obdclass/fsfilt_reiserfs.c
index 836f4f1..3d118fc 100644
--- a/lustre/obdclass/fsfilt_reiserfs.c
+++ b/lustre/obdclass/fsfilt_reiserfs.c
@@ -55,13 +55,12 @@ static void *fsfilt_reiserfs_start(struct inode *inode, int op,
 }
 
 static void *fsfilt_reiserfs_brw_start(int objcount, struct fsfilt_objinfo *fso,
-                                       int niocount, struct niobuf_remote *nb,
-                                       void *desc_private)
+                                       int niocount, void *desc_private)
 {
         return (void *)0xf00f00be;
 }
 
-static int fsfilt_reiserfs_commit(struct inode *inode, void *handle, 
+static int fsfilt_reiserfs_commit(struct inode *inode, void *handle,
                                   int force_sync)
 {
         if (handle != (void *)0xf00f00be) {
-- 
1.8.3.1