projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[S390] dasd: Work around gcc bug.
[powerpc.git]
/
drivers
/
s390
/
block
/
dcssblk.c
diff --git
a/drivers/s390/block/dcssblk.c
b/drivers/s390/block/dcssblk.c
index
4413325
..
1340451
100644
(file)
--- a/
drivers/s390/block/dcssblk.c
+++ b/
drivers/s390/block/dcssblk.c
@@
-102,7
+102,7
@@
dcssblk_release_segment(struct device *dev)
* device needs to be enqueued before the semaphore is
* freed.
*/
* device needs to be enqueued before the semaphore is
* freed.
*/
-static in
line in
t
+static int
dcssblk_assign_free_minor(struct dcssblk_dev_info *dev_info)
{
int minor, found;
dcssblk_assign_free_minor(struct dcssblk_dev_info *dev_info)
{
int minor, found;
@@
-230,7
+230,7
@@
dcssblk_shared_store(struct device *dev, struct device_attribute *attr, const ch
SEGMENT_SHARED);
if (rc < 0) {
BUG_ON(rc == -EINVAL);
SEGMENT_SHARED);
if (rc < 0) {
BUG_ON(rc == -EINVAL);
- if (rc
== -EIO || rc == -ENOENT
)
+ if (rc
!= -EAGAIN
)
goto removeseg;
} else {
dev_info->is_shared = 1;
goto removeseg;
} else {
dev_info->is_shared = 1;
@@
-253,7
+253,7
@@
dcssblk_shared_store(struct device *dev, struct device_attribute *attr, const ch
SEGMENT_EXCLUSIVE);
if (rc < 0) {
BUG_ON(rc == -EINVAL);
SEGMENT_EXCLUSIVE);
if (rc < 0) {
BUG_ON(rc == -EINVAL);
- if (rc
== -EIO || rc == -ENOENT
)
+ if (rc
!= -EAGAIN
)
goto removeseg;
} else {
dev_info->is_shared = 0;
goto removeseg;
} else {
dev_info->is_shared = 0;
@@
-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);