git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'cma', 'cxgb3', 'ehca', 'ipath', 'ipoib', 'mad', 'misc', 'mlx4', ...
[safe/jmp/linux-2.6]
/
drivers
/
s390
/
block
/
dcssblk.c
diff --git
a/drivers/s390/block/dcssblk.c
b/drivers/s390/block/dcssblk.c
index
01fcdd9
..
711b300
100644
(file)
--- a/
drivers/s390/block/dcssblk.c
+++ b/
drivers/s390/block/dcssblk.c
@@
-384,6
+384,11
@@
dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char
* get minor, add to list
*/
down_write(&dcssblk_devices_sem);
* get minor, add to list
*/
down_write(&dcssblk_devices_sem);
+ if (dcssblk_get_device_by_name(local_buf)) {
+ up_write(&dcssblk_devices_sem);
+ rc = -EEXIST;
+ goto unload_seg;
+ }
rc = dcssblk_assign_free_minor(dev_info);
if (rc) {
up_write(&dcssblk_devices_sem);
rc = dcssblk_assign_free_minor(dev_info);
if (rc) {
up_write(&dcssblk_devices_sem);