diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-14 17:26:53 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-14 17:26:53 +0200 |
commit | f81b691a3df09806385ea413c3a2ee094c705ca3 (patch) | |
tree | 01c0d6d319fcbddc98171d06cfe8e742cd270455 /drivers/s390/block/dcssblk.c | |
parent | x86: make sure the CPA test code's use of _PAGE_UNUSED1 is obvious (diff) | |
parent | Linux 2.6.27-rc6 (diff) | |
download | linux-f81b691a3df09806385ea413c3a2ee094c705ca3.tar.xz linux-f81b691a3df09806385ea413c3a2ee094c705ca3.zip |
Merge commit 'v2.6.27-rc6' into x86/pat
Diffstat (limited to 'drivers/s390/block/dcssblk.c')
-rw-r--r-- | drivers/s390/block/dcssblk.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c index 01fcdd91b846..711b3004b3e6 100644 --- 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); + 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); |