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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
s390
/
block
/
dasd_eer.c
diff --git
a/drivers/s390/block/dasd_eer.c
b/drivers/s390/block/dasd_eer.c
index
2d946b6
..
da65f1b
100644
(file)
--- a/
drivers/s390/block/dasd_eer.c
+++ b/
drivers/s390/block/dasd_eer.c
@@
-89,7
+89,7
@@
struct eerbuffer {
};
static LIST_HEAD(bufferlist);
};
static LIST_HEAD(bufferlist);
-static
spinlock_t bufferlock = SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(bufferlock)
;
static DECLARE_WAIT_QUEUE_HEAD(dasd_eer_read_wait_queue);
/*
static DECLARE_WAIT_QUEUE_HEAD(dasd_eer_read_wait_queue);
/*
@@
-276,7
+276,7
@@
struct dasd_eer_header {
__u64 tv_sec;
__u64 tv_usec;
char busid[DASD_EER_BUSID_SIZE];
__u64 tv_sec;
__u64 tv_usec;
char busid[DASD_EER_BUSID_SIZE];
-};
+}
__attribute__ ((packed))
;
/*
* The following function can be used for those triggers that have
/*
* The following function can be used for those triggers that have
@@
-521,6
+521,8
@@
static int dasd_eer_open(struct inode *inp, struct file *filp)
unsigned long flags;
eerb = kzalloc(sizeof(struct eerbuffer), GFP_KERNEL);
unsigned long flags;
eerb = kzalloc(sizeof(struct eerbuffer), GFP_KERNEL);
+ if (!eerb)
+ return -ENOMEM;
eerb->buffer_page_count = eer_pages;
if (eerb->buffer_page_count < 1 ||
eerb->buffer_page_count > INT_MAX / PAGE_SIZE) {
eerb->buffer_page_count = eer_pages;
if (eerb->buffer_page_count < 1 ||
eerb->buffer_page_count > INT_MAX / PAGE_SIZE) {