c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 18:40:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add class / device portability code. Two autoconf tests

Browse Source 
were added to cover the 3 possible APIs from 2.6.9 to
2.6.26.  We attempt to use the newest interfaces and if
not available fallback to the oldest.  This a rework of
some changes proposed by Ricardo for RHEL4.



git-svn-id: https://outreach.scidac.gov/svn/spl/trunk@150 7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c
This commit is contained in:
behlendo
2008-08-10 03:50:36 +00:00
parent 877a32e91e
commit 46c685d0c4
8 changed files with 103 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/spl/spl-module.c
+7 -7
View File
@@ -153,7 +153,7 @@ __ddi_create_minor_node(dev_info_t *di, char *name, int spec_type,
RETURN(DDI_FAILURE);
}
di->di_class = class_create(THIS_MODULE, name);
di->di_class = spl_class_create(THIS_MODULE, name);
if (IS_ERR(di->di_class)) {
rc = PTR_ERR(di->di_class);
CERROR("Error creating %s class, %d\n", name, rc);
@@ -165,11 +165,11 @@ __ddi_create_minor_node(dev_info_t *di, char *name, int spec_type,
/* Do not append a 0 to devices with minor nums of 0 */
if (di->di_minor == 0) {
class_device_create(di->di_class, NULL, di->di_dev,
NULL, "%s", name);
spl_device_create(di->di_class, NULL, di->di_dev,
NULL, "%s", name);
} else {
class_device_create(di->di_class, NULL, di->di_dev,
NULL, "%s%d", name, di->di_minor);
spl_device_create(di->di_class, NULL, di->di_dev,
NULL, "%s%d", name, di->di_minor);
}
di->di_cdev = cdev;
@@ -188,8 +188,8 @@ static void
__ddi_remove_minor_node_locked(dev_info_t *di, char *name)
{
if (di->di_class) {
class_device_destroy(di->di_class, di->di_dev);
class_destroy(di->di_class);
spl_device_destroy(di->di_class, di->di_dev);
spl_class_destroy(di->di_class);
di->di_class = NULL;
di->di_dev = 0;
modules/splat/splat-ctl.c
+8 -35
View File
@@ -42,18 +42,7 @@
#include "splat-internal.h"
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
#include <linux/devfs_fs_kernel.h>
#endif
#include <linux/cdev.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
static struct class_simple *splat_class;
#else
static struct class *splat_class;
#endif
static spl_class *splat_class;
static struct list_head splat_module_list;
static spinlock_t splat_module_lock;
@@ -594,7 +583,7 @@ static struct file_operations splat_fops = {
static struct cdev splat_cdev = {
.owner = THIS_MODULE,
.kobj = { .name = "splatctl", },
.kobj = { .name = SPLAT_NAME, },
};
static int __init
@@ -619,7 +608,7 @@ splat_init(void)
SPLAT_SUBSYSTEM_INIT(atomic);
dev = MKDEV(SPLAT_MAJOR, 0);
if ((rc = register_chrdev_region(dev, SPLAT_MINORS, "splatctl")))
if ((rc = register_chrdev_region(dev, SPLAT_MINORS, SPLAT_NAME)))
goto error;
/* Support for registering a character driver */
@@ -632,11 +621,7 @@ splat_init(void)
}
/* Support for udev make driver info available in sysfs */
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
splat_class = class_simple_create(THIS_MODULE, "splat");
#else
splat_class = class_create(THIS_MODULE, "splat");
#endif
splat_class = spl_class_create(THIS_MODULE, "splat");
if (IS_ERR(splat_class)) {
rc = PTR_ERR(splat_class);
printk(KERN_ERR "splat: Error creating splat class, %d\n", rc);
@@ -645,13 +630,8 @@ splat_init(void)
goto error;
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
class_simple_device_add(splat_class, MKDEV(SPLAT_MAJOR, 0),
NULL, "splatctl");
#else
class_device_create(splat_class, NULL, MKDEV(SPLAT_MAJOR, 0),
NULL, "splatctl");
#endif
spl_device_create(splat_class, NULL, MKDEV(SPLAT_MAJOR, 0),
NULL, SPLAT_NAME);
printk(KERN_INFO "splat: Loaded Solaris Porting LAyer "
"Tests v%s\n", VERSION);
@@ -666,15 +646,8 @@ splat_fini(void)
{
dev_t dev = MKDEV(SPLAT_MAJOR, 0);
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
class_simple_device_remove(dev);
class_simple_destroy(splat_class);
devfs_remove("splat/splatctl");
devfs_remove("splat");
#else
class_device_destroy(splat_class, dev);
class_destroy(splat_class);
#endif
spl_device_destroy(splat_class, dev);
spl_class_destroy(splat_class);
cdev_del(&splat_cdev);
unregister_chrdev_region(dev, SPLAT_MINORS);
modules/splat/splat-internal.h
+2
View File
@@ -60,7 +60,9 @@
#include <sys/types.h>
#include <sys/kobj.h>
#include <sys/atomic.h>
#include <linux/cdev.h>
#include "spl-device.h"
#include "splat-ctl.h"
#define SPLAT_SUBSYSTEM_INIT(type) \