git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
s390
/
block
/
dcssblk.c
diff --git
a/drivers/s390/block/dcssblk.c
b/drivers/s390/block/dcssblk.c
index
2e727f4
..
be9b053
100644
(file)
--- a/
drivers/s390/block/dcssblk.c
+++ b/
drivers/s390/block/dcssblk.c
@@
-273,7
+273,7
@@
removeseg:
list_del(&dev_info->lh);
del_gendisk(dev_info->gd);
list_del(&dev_info->lh);
del_gendisk(dev_info->gd);
- blk_
put
_queue(dev_info->dcssblk_queue);
+ blk_
cleanup
_queue(dev_info->dcssblk_queue);
dev_info->gd->queue = NULL;
put_disk(dev_info->gd);
device_unregister(dev);
dev_info->gd->queue = NULL;
put_disk(dev_info->gd);
device_unregister(dev);
@@
-388,12
+388,11
@@
dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
/*
* get a struct dcssblk_dev_info
*/
/*
* get a struct dcssblk_dev_info
*/
- dev_info = k
m
alloc(sizeof(struct dcssblk_dev_info), GFP_KERNEL);
+ dev_info = k
z
alloc(sizeof(struct dcssblk_dev_info), GFP_KERNEL);
if (dev_info == NULL) {
rc = -ENOMEM;
goto out;
}
if (dev_info == NULL) {
rc = -ENOMEM;
goto out;
}
- memset(dev_info, 0, sizeof(struct dcssblk_dev_info));
strcpy(dev_info->segment_name, local_buf);
strlcpy(dev_info->dev.bus_id, local_buf, BUS_ID_SIZE);
strcpy(dev_info->segment_name, local_buf);
strlcpy(dev_info->dev.bus_id, local_buf, BUS_ID_SIZE);
@@
-491,7
+490,7
@@
dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
unregister_dev:
PRINT_ERR("device_create_file() failed!\n");
list_del(&dev_info->lh);
unregister_dev:
PRINT_ERR("device_create_file() failed!\n");
list_del(&dev_info->lh);
- blk_
put
_queue(dev_info->dcssblk_queue);
+ blk_
cleanup
_queue(dev_info->dcssblk_queue);
dev_info->gd->queue = NULL;
put_disk(dev_info->gd);
device_unregister(&dev_info->dev);
dev_info->gd->queue = NULL;
put_disk(dev_info->gd);
device_unregister(&dev_info->dev);
@@
-505,7
+504,7
@@
list_del:
unload_seg:
segment_unload(local_buf);
dealloc_gendisk:
unload_seg:
segment_unload(local_buf);
dealloc_gendisk:
- blk_
put
_queue(dev_info->dcssblk_queue);
+ blk_
cleanup
_queue(dev_info->dcssblk_queue);
dev_info->gd->queue = NULL;
put_disk(dev_info->gd);
free_dev_info:
dev_info->gd->queue = NULL;
put_disk(dev_info->gd);
free_dev_info:
@@
-562,7
+561,7
@@
dcssblk_remove_store(struct device *dev, struct device_attribute *attr, const ch
list_del(&dev_info->lh);
del_gendisk(dev_info->gd);
list_del(&dev_info->lh);
del_gendisk(dev_info->gd);
- blk_
put
_queue(dev_info->dcssblk_queue);
+ blk_
cleanup
_queue(dev_info->dcssblk_queue);
dev_info->gd->queue = NULL;
put_disk(dev_info->gd);
device_unregister(&dev_info->dev);
dev_info->gd->queue = NULL;
put_disk(dev_info->gd);
device_unregister(&dev_info->dev);