LU-409 stop loading the llite_lloop module for >= 2.6.32 kernels

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

diff --git a/lustre/lvfs/fsfilt.c b/lustre/lvfs/fsfilt.c
index cc14ab6..0100333 100644 (file)
--- a/lustre/lvfs/fsfilt.c
+++ b/lustre/lvfs/fsfilt.c
@@ -1,15 +1,50 @@
+/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
+ * vim:expandtab:shiftwidth=8:tabstop=8:
+ *
+ * GPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * 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.
+ *
+ * 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).
+ *
+ * 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
+ *
+ * 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  2008 Sun Microsystems, Inc. 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.
+ */
+
 #ifndef EXPORT_SYMTAB
 # define EXPORT_SYMTAB
 #endif
 #define DEBUG_SUBSYSTEM S_FILTER
 
 #include <linux/fs.h>
-#include <linux/jbd.h>
 #include <linux/module.h>
 #include <linux/kmod.h>
 #include <linux/slab.h>
 #include <libcfs/kp30.h>
-#include <linux/lustre_fsfilt.h>
+#include <lustre_fsfilt.h>
 
 LIST_HEAD(fsfilt_types);
 
@@ -35,16 +70,16 @@ int fsfilt_register_ops(struct fsfilt_operations *fs_ops)
         if ((found = fsfilt_search_type(fs_ops->fs_type))) {
                 if (found != fs_ops) {
                         CERROR("different operations for type %s\n",
-                              fs_ops->fs_type);
+                               fs_ops->fs_type);
                         /* unlock fsfilt_types list */
                         RETURN(-EEXIST);
                 }
         } else {
                 PORTAL_MODULE_USE;
-               list_add(&fs_ops->fs_list, &fsfilt_types);
-       }
+                list_add(&fs_ops->fs_list, &fsfilt_types);
+        }
 
-       /* unlock fsfilt_types list */
+        /* unlock fsfilt_types list */
         return 0;
 }
 
@@ -54,7 +89,7 @@ void fsfilt_unregister_ops(struct fsfilt_operations *fs_ops)
 
         /* lock fsfilt_types list */
         list_for_each(p, &fsfilt_types) {
-               struct fsfilt_operations *found;
+                struct fsfilt_operations *found;
 
                 found = list_entry(p, typeof(*found), fs_list);
                 if (found == fs_ops) {
@@ -78,7 +113,7 @@ struct fsfilt_operations *fsfilt_get_ops(const char *type)
                 snprintf(name, sizeof(name) - 1, "fsfilt_%s", type);
                 name[sizeof(name) - 1] = '\0';
 
-                if (!(rc = request_module(name))) {
+                if (!(rc = request_module("%s", name))) {
                         fs_ops = fsfilt_search_type(type);
                         CDEBUG(D_INFO, "Loaded module '%s'\n", name);
                         if (!fs_ops)
@@ -86,9 +121,9 @@ struct fsfilt_operations *fsfilt_get_ops(const char *type)
                 }
 
                 if (rc) {
-                        CERROR("Can't find fsfilt_%s interface\n", name);
-                        RETURN(ERR_PTR(rc));
-                       /* unlock fsfilt_types list */
+                        CERROR("Can't find %s interface\n", name);
+                        RETURN(ERR_PTR(rc < 0 ? rc : -rc));
+                        /* unlock fsfilt_types list */
                 }
         }
         try_module_get(fs_ops->fs_owner);