aboutsummaryrefslogtreecommitdiffstats
path: root/driver
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2007-10-17 15:09:04 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2007-10-17 15:09:04 -0700
commite1863ecb56206646a2007fc1b1fe771b95971562 (patch)
treeb0438685659b0cd40a937d786f78f5eb9beff0e7 /driver
parent1224c1072385b5faf9719a971a9fcc477c1b89c2 (diff)
downloadpatches-e1863ecb56206646a2007fc1b1fe771b95971562.tar.gz
2.6.23-git11 resync and a new patch added
Diffstat (limited to 'driver')
-rw-r--r--driver/block-device.patch14
-rw-r--r--driver/driver-core-remove-class_device_-_bin_file.patch67
-rw-r--r--driver/ecryptfs-sysfs-fixes.patch10
-rw-r--r--driver/nozomi.patch2
-rw-r--r--driver/remove-struct-kobj_type-from-struct-kset.patch32
5 files changed, 96 insertions, 29 deletions
diff --git a/driver/block-device.patch b/driver/block-device.patch
index 2877f1d0926d4c..926028411444b6 100644
--- a/driver/block-device.patch
+++ b/driver/block-device.patch
@@ -726,7 +726,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
EXPORT_SYMBOL(put_disk);
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
-@@ -4188,7 +4188,7 @@ int blk_register_queue(struct gendisk *d
+@@ -4196,7 +4196,7 @@ int blk_register_queue(struct gendisk *d
if (!q || !q->request_fn)
return -ENXIO;
@@ -735,7 +735,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
ret = kobject_add(&q->kobj);
if (ret < 0)
-@@ -4215,6 +4215,6 @@ void blk_unregister_queue(struct gendisk
+@@ -4223,6 +4223,6 @@ void blk_unregister_queue(struct gendisk
kobject_uevent(&q->kobj, KOBJ_REMOVE);
kobject_del(&q->kobj);
@@ -915,7 +915,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
static int
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
-@@ -338,14 +338,17 @@ harderror:
+@@ -374,14 +374,17 @@ harderror:
return NULL;
}
@@ -937,7 +937,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
.show = pid_show,
};
-@@ -357,7 +360,7 @@ static int nbd_do_it(struct nbd_device *
+@@ -393,7 +396,7 @@ static int nbd_do_it(struct nbd_device *
BUG_ON(lo->magic != LO_MAGIC);
lo->pid = current->pid;
@@ -946,7 +946,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
if (ret) {
printk(KERN_ERR "nbd: sysfs_create_file failed!");
return ret;
-@@ -366,7 +369,7 @@ static int nbd_do_it(struct nbd_device *
+@@ -402,7 +405,7 @@ static int nbd_do_it(struct nbd_device *
while ((req = nbd_read_stat(lo)) != NULL)
nbd_end_request(req);
@@ -991,7 +991,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
if ((err = sysfs_create_link(&rdev->kobj, ko, "block"))) {
kobject_del(&rdev->kobj);
goto fail;
-@@ -3075,7 +3075,7 @@ static struct kobject *md_probe(dev_t de
+@@ -3082,7 +3082,7 @@ static struct kobject *md_probe(dev_t de
add_disk(disk);
mddev->gendisk = disk;
mutex_unlock(&disks_mutex);
@@ -1000,7 +1000,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
kobject_set_name(&mddev->kobj, "%s", "md");
mddev->kobj.ktype = &md_ktype;
if (kobject_register(&mddev->kobj))
-@@ -3352,7 +3352,7 @@ static int do_md_run(mddev_t * mddev)
+@@ -3359,7 +3359,7 @@ static int do_md_run(mddev_t * mddev)
mddev->changed = 1;
md_new_event(mddev);
diff --git a/driver/driver-core-remove-class_device_-_bin_file.patch b/driver/driver-core-remove-class_device_-_bin_file.patch
new file mode 100644
index 00000000000000..ba0bd91cfaebd4
--- /dev/null
+++ b/driver/driver-core-remove-class_device_-_bin_file.patch
@@ -0,0 +1,67 @@
+From foo@baz Tue Apr 9 12:12:43 2002
+Date: Wed, 17 Oct 2007 15:52:43 -0600
+To: Greg KH <greg@kroah.com>
+From: Greg Kroah-Hartman <gregkh@suse.de>
+Subject: Driver core: remove class_device_*_bin_file
+
+These functions are not used by anyone, so remove them from the tree.
+
+The class_device code will be removed soon anyway, so no future users
+will ever be possible.
+
+
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
+---
+ drivers/base/class.c | 18 ------------------
+ include/linux/device.h | 4 ----
+ 2 files changed, 22 deletions(-)
+
+--- a/drivers/base/class.c
++++ b/drivers/base/class.c
+@@ -257,22 +257,6 @@ void class_device_remove_file(struct cla
+ sysfs_remove_file(&class_dev->kobj, &attr->attr);
+ }
+
+-int class_device_create_bin_file(struct class_device *class_dev,
+- struct bin_attribute *attr)
+-{
+- int error = -EINVAL;
+- if (class_dev)
+- error = sysfs_create_bin_file(&class_dev->kobj, attr);
+- return error;
+-}
+-
+-void class_device_remove_bin_file(struct class_device *class_dev,
+- struct bin_attribute *attr)
+-{
+- if (class_dev)
+- sysfs_remove_bin_file(&class_dev->kobj, attr);
+-}
+-
+ static ssize_t
+ class_device_attr_show(struct kobject * kobj, struct attribute * attr,
+ char * buf)
+@@ -885,8 +869,6 @@ EXPORT_SYMBOL_GPL(class_device_create);
+ EXPORT_SYMBOL_GPL(class_device_destroy);
+ EXPORT_SYMBOL_GPL(class_device_create_file);
+ EXPORT_SYMBOL_GPL(class_device_remove_file);
+-EXPORT_SYMBOL_GPL(class_device_create_bin_file);
+-EXPORT_SYMBOL_GPL(class_device_remove_bin_file);
+
+ EXPORT_SYMBOL_GPL(class_interface_register);
+ EXPORT_SYMBOL_GPL(class_interface_unregister);
+--- a/include/linux/device.h
++++ b/include/linux/device.h
+@@ -291,10 +291,6 @@ extern void class_device_put(struct clas
+
+ extern void class_device_remove_file(struct class_device *,
+ const struct class_device_attribute *);
+-extern int __must_check class_device_create_bin_file(struct class_device *,
+- struct bin_attribute *);
+-extern void class_device_remove_bin_file(struct class_device *,
+- struct bin_attribute *);
+
+ struct class_interface {
+ struct list_head node;
diff --git a/driver/ecryptfs-sysfs-fixes.patch b/driver/ecryptfs-sysfs-fixes.patch
index a4be1c732f9e69..b9651163f559ad 100644
--- a/driver/ecryptfs-sysfs-fixes.patch
+++ b/driver/ecryptfs-sysfs-fixes.patch
@@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
-@@ -731,58 +731,14 @@ static int ecryptfs_init_kmem_caches(voi
+@@ -730,58 +730,14 @@ static int ecryptfs_init_kmem_caches(voi
return 0;
}
@@ -87,7 +87,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
static struct ecryptfs_version_str_map_elem {
u32 flag;
-@@ -796,7 +752,7 @@ static struct ecryptfs_version_str_map_e
+@@ -795,7 +751,7 @@ static struct ecryptfs_version_str_map_e
{ECRYPTFS_VERSIONING_MULTKEY, "multiple keys per file"}
};
@@ -96,7 +96,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
{
int i;
int remaining = PAGE_SIZE;
-@@ -823,7 +779,17 @@ out:
+@@ -822,7 +778,17 @@ out:
return total_written;
}
@@ -115,7 +115,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
static int do_sysfs_registration(void)
{
-@@ -835,23 +801,11 @@ static int do_sysfs_registration(void)
+@@ -834,23 +800,11 @@ static int do_sysfs_registration(void)
"Unable to register ecryptfs sysfs subsystem\n");
goto out;
}
@@ -141,7 +141,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
out:
return rc;
-@@ -859,10 +813,7 @@ out:
+@@ -858,10 +812,7 @@ out:
static void do_sysfs_unregistration(void)
{
diff --git a/driver/nozomi.patch b/driver/nozomi.patch
index 8bae3315122cfb..07ccb66a2bf859 100644
--- a/driver/nozomi.patch
+++ b/driver/nozomi.patch
@@ -27,7 +27,7 @@ Signed-off-by: Frank Seidel <fseidel@suse.de>
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
-@@ -373,6 +373,16 @@ config ISTALLION
+@@ -390,6 +390,16 @@ config ISTALLION
To compile this driver as a module, choose M here: the
module will be called istallion.
diff --git a/driver/remove-struct-kobj_type-from-struct-kset.patch b/driver/remove-struct-kobj_type-from-struct-kset.patch
index 69810067635103..7d61cb6e78ccd0 100644
--- a/driver/remove-struct-kobj_type-from-struct-kset.patch
+++ b/driver/remove-struct-kobj_type-from-struct-kset.patch
@@ -206,7 +206,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
error = subsystem_register(&cls->subsys);
if (!error) {
-@@ -452,7 +453,7 @@ static struct kset_uevent_ops class_ueve
+@@ -436,7 +437,7 @@ static struct kset_uevent_ops class_ueve
.uevent = class_uevent,
};
@@ -215,7 +215,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
static int class_device_add_attrs(struct class_device * cd)
-@@ -537,7 +538,8 @@ static struct class_device_attribute cla
+@@ -521,7 +522,8 @@ static struct class_device_attribute cla
void class_device_initialize(struct class_device *class_dev)
{
@@ -499,7 +499,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
printk("dlm_lockspace_init: cannot register kset %d\n", error);
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
-@@ -731,7 +731,7 @@ static int ecryptfs_init_kmem_caches(voi
+@@ -730,7 +730,7 @@ static int ecryptfs_init_kmem_caches(voi
return 0;
}
@@ -508,7 +508,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
static ssize_t version_show(struct kset *kset, char *buff)
{
-@@ -795,6 +795,7 @@ static int do_sysfs_registration(void)
+@@ -794,6 +794,7 @@ static int do_sysfs_registration(void)
{
int rc;
@@ -516,7 +516,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
rc = subsystem_register(&ecryptfs_subsys);
if (rc) {
printk(KERN_ERR
-@@ -842,7 +843,6 @@ static int __init ecryptfs_init(void)
+@@ -841,7 +842,6 @@ static int __init ecryptfs_init(void)
printk(KERN_ERR "Failed to register filesystem\n");
goto out_free_kmem_caches;
}
@@ -526,7 +526,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
printk(KERN_ERR "sysfs registration failed\n");
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
-@@ -680,8 +680,8 @@ static inline void unregister_fuseblk(vo
+@@ -717,8 +717,8 @@ static inline void unregister_fuseblk(vo
}
#endif
@@ -535,9 +535,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+static decl_subsys(fuse, NULL);
+static decl_subsys(connections, NULL);
- static void fuse_inode_init_once(void *foo, struct kmem_cache *cachep,
- unsigned long flags)
-@@ -732,12 +732,12 @@ static int fuse_sysfs_init(void)
+ static void fuse_inode_init_once(struct kmem_cache *cachep, void *foo)
+ {
+@@ -768,12 +768,12 @@ static int fuse_sysfs_init(void)
{
int err;
@@ -696,7 +696,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/kernel/ksysfs.c
+++ b/kernel/ksysfs.c
-@@ -85,7 +85,7 @@ static struct bin_attribute notes_attr =
+@@ -94,7 +94,7 @@ static struct bin_attribute notes_attr =
.read = &notes_read,
};
@@ -707,7 +707,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
static struct attribute * kernel_attrs[] = {
--- a/kernel/module.c
+++ b/kernel/module.c
-@@ -1123,7 +1123,7 @@ int mod_sysfs_init(struct module *mod)
+@@ -1221,7 +1221,7 @@ int mod_sysfs_init(struct module *mod)
err = kobject_set_name(&mod->mkobj.kobj, "%s", mod->name);
if (err)
goto out;
@@ -727,7 +727,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
static inline char dash2underscore(char c)
{
if (c == '-')
-@@ -563,7 +565,8 @@ static void __init kernel_param_sysfs_se
+@@ -560,7 +562,8 @@ static void __init kernel_param_sysfs_se
BUG_ON(!mk);
mk->mod = THIS_MODULE;
@@ -737,7 +737,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
kobject_set_name(&mk->kobj, name);
kobject_init(&mk->kobj);
ret = kobject_add(&mk->kobj);
-@@ -679,8 +682,6 @@ static struct sysfs_ops module_sysfs_ops
+@@ -676,8 +679,6 @@ static struct sysfs_ops module_sysfs_ops
.store = module_attr_store,
};
@@ -746,7 +746,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
static int uevent_filter(struct kset *kset, struct kobject *kobj)
{
struct kobj_type *ktype = get_ktype(kobj);
-@@ -694,7 +695,7 @@ static struct kset_uevent_ops module_uev
+@@ -691,7 +692,7 @@ static struct kset_uevent_ops module_uev
.filter = uevent_filter,
};
@@ -768,7 +768,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
/**
--- a/mm/slub.c
+++ b/mm/slub.c
-@@ -3864,7 +3864,7 @@ static struct kset_uevent_ops slab_ueven
+@@ -3860,7 +3860,7 @@ static struct kset_uevent_ops slab_ueven
.filter = uevent_filter,
};
@@ -777,7 +777,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
#define ID_STR_LENGTH 64
-@@ -3927,8 +3927,9 @@ static int sysfs_slab_add(struct kmem_ca
+@@ -3923,8 +3923,9 @@ static int sysfs_slab_add(struct kmem_ca
name = create_unique_id(s);
}
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 20:31:59 +0000