Fix help message for --threads.

[fs/lustre-release.git] / lustre / mds / mds_ext3.c

diff --git a/lustre/mds/mds_ext3.c b/lustre/mds/mds_ext3.c
index 8c5d9bf..fa17adc 100644 (file)
--- a/lustre/mds/mds_ext3.c
+++ b/lustre/mds/mds_ext3.c
@@ -183,7 +183,6 @@ static void mds_ext3_delete_inode(struct inode *inode)
                 mds_ext3_fs_ops.cl_delete_inode(inode);
 }
 
-
 static void mds_ext3_callback_status(void *jcb, int error)
 {
         struct mds_cb_data *mcb = (struct mds_cb_data *)jcb;
@@ -197,13 +196,6 @@ static void mds_ext3_callback_status(void *jcb, int error)
         --jcb_cache_count;
 }
 
-#ifdef HAVE_JOURNAL_CALLBACK
-static void mds_ext3_callback_func(void *cb_data)
-{
-        mds_ext3_callback_status(cb_data, 0);
-}
-#endif
-
 static int mds_ext3_set_last_rcvd(struct mds_obd *mds, void *handle)
 {
         struct mds_cb_data *mcb;
@@ -221,12 +213,6 @@ static int mds_ext3_set_last_rcvd(struct mds_obd *mds, void *handle)
                (unsigned long long)mcb->cb_last_rcvd);
         journal_callback_set(handle, mds_ext3_callback_status,
                              (void *)mcb);
-#elif defined(HAVE_JOURNAL_CALLBACK)
-        /* XXX original patch version - remove soon */
-#warning "using old journal callback kernel patch, please update"
-        CDEBUG(D_EXT2, "set callback for last_rcvd: %Ld\n",
-               (unsigned long long)mcb->cb_last_rcvd);
-        journal_callback_set(handle, mds_ext3_callback_func, mcb);
 #else
 #warning "no journal callback kernel patch, faking it..."
         {
@@ -253,16 +239,17 @@ static int mds_ext3_journal_data(struct file *filp)
 }
 
 static struct mds_fs_operations mds_ext3_fs_ops = {
-        fs_start:       mds_ext3_start,
-        fs_commit:      mds_ext3_commit,
-        fs_setattr:     mds_ext3_setattr,
-        fs_set_objid:   mds_ext3_set_objid,
-        fs_get_objid:   mds_ext3_get_objid,
-        fs_readpage:    mds_ext3_readpage,
-        fs_delete_inode:mds_ext3_delete_inode,
-        cl_delete_inode:clear_inode,
-        fs_journal_data:mds_ext3_journal_data,
-        fs_set_last_rcvd:mds_ext3_set_last_rcvd,
+        fs_owner:               THIS_MODULE,
+        fs_start:               mds_ext3_start,
+        fs_commit:              mds_ext3_commit,
+        fs_setattr:             mds_ext3_setattr,
+        fs_set_objid:           mds_ext3_set_objid,
+        fs_get_objid:           mds_ext3_get_objid,
+        fs_readpage:            mds_ext3_readpage,
+        fs_delete_inode:        mds_ext3_delete_inode,
+        cl_delete_inode:        clear_inode,
+        fs_journal_data:        mds_ext3_journal_data,
+        fs_set_last_rcvd:       mds_ext3_set_last_rcvd,
 };
 
 static int __init mds_ext3_init(void)
@@ -298,7 +285,7 @@ static void __exit mds_ext3_exit(void)
         }
 }
 
-MODULE_AUTHOR("Cluster File Systems, Inc. <adilger@clusterfs.com>");
+MODULE_AUTHOR("Cluster File Systems, Inc. <info@clusterfs.com>");
 MODULE_DESCRIPTION("Lustre MDS ext3 Filesystem Helper v0.1");
 MODULE_LICENSE("GPL");