LU-82 Remove useless clio locks

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

diff --git a/lustre/lvfs/fsfilt_reiserfs.c b/lustre/lvfs/fsfilt_reiserfs.c
index f03f853..5d93679 100644 (file)
--- a/lustre/lvfs/fsfilt_reiserfs.c
+++ b/lustre/lvfs/fsfilt_reiserfs.c
@@ -1,26 +1,41 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
- *  lustre/lib/fsfilt_reiserfs.c
- *  Lustre filesystem abstraction routines
+ * GPL HEADER START
  *
- *  Copyright (C) 2002 Cluster File Systems, Inc.
- *   Author: Andreas Dilger <adilger@clusterfs.com>
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *   This file is part of Lustre, http://www.lustre.org.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
  *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
  *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
  *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ *
+ * lustre/lvfs/fsfilt_reiserfs.c
+ *
+ * Author: Andreas Dilger <adilger@clusterfs.com>
  */
 
 /*
@@ -37,14 +52,11 @@
 #include <linux/pagemap.h>
 #include <linux/quotaops.h>
 #include <linux/version.h>
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
 #include <linux/init.h>
 #include <asm/statfs.h>
-#endif
-#include <libcfs/kp30.h>
+#include <libcfs/libcfs.h>
 #include <lustre_fsfilt.h>
 #include <obd.h>
-#include <obd_class.h>
 #include <linux/module.h>
 #include <linux/init.h>
 
@@ -85,7 +97,7 @@ static int fsfilt_reiserfs_setattr(struct dentry *dentry, void *handle,
         struct inode *inode = dentry->d_inode;
         int rc;
 
-        lock_kernel();
+        cfs_lock_kernel();
 
         /* A _really_ horrible hack to avoid removing the data stored
          * in the block pointers; this is really the "small" stripe MD data.
@@ -119,7 +131,7 @@ static int fsfilt_reiserfs_setattr(struct dentry *dentry, void *handle,
                         rc = inode_setattr(inode, iattr);
         }
 
-        unlock_kernel();
+        cfs_unlock_kernel();
 
         return rc;
 }
@@ -155,9 +167,9 @@ static int fsfilt_reiserfs_add_journal_cb(struct obd_device *obd,
 {
         static unsigned long next = 0;
 
-        if (time_after(jiffies, next)) {
+        if (cfs_time_after(jiffies, next)) {
                 CERROR("no journal callback kernel patch, faking it...\n");
-                next = jiffies + 300 * HZ;
+                next = jiffies + 300 * CFS_HZ;
         }
 
         cb_func(obd, last_rcvd, cb_data, 0);
@@ -172,9 +184,7 @@ static int fsfilt_reiserfs_statfs(struct super_block *sb,
         int rc;
 
         memset(&sfs, 0, sizeof(sfs));
-
         rc = ll_do_statfs(sb, &sfs);
-
         statfs_pack(osfs, &sfs);
         return rc;
 }
@@ -239,7 +249,7 @@ static void __exit fsfilt_reiserfs_exit(void)
         fsfilt_unregister_ops(&fsfilt_reiserfs_ops);
 }
 
-MODULE_AUTHOR("Cluster File Systems, Inc. <info@clusterfs.com>");
+MODULE_AUTHOR("Sun Microsystems, Inc. <http://www.lustre.org/>");
 MODULE_DESCRIPTION("Lustre reiserfs Filesystem Helper v0.1");
 MODULE_LICENSE("GPL");