Commit 5e24eb08 authored by Martin Schwidefsky's avatar Martin Schwidefsky Committed by Martin Schwidefsky

[S390] dasd: remove BKL from extended error reporting code

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 3b47f9d5
...@@ -536,7 +536,6 @@ static int dasd_eer_open(struct inode *inp, struct file *filp) ...@@ -536,7 +536,6 @@ static int dasd_eer_open(struct inode *inp, struct file *filp)
eerb = kzalloc(sizeof(struct eerbuffer), GFP_KERNEL); eerb = kzalloc(sizeof(struct eerbuffer), GFP_KERNEL);
if (!eerb) if (!eerb)
return -ENOMEM; return -ENOMEM;
lock_kernel();
eerb->buffer_page_count = eer_pages; eerb->buffer_page_count = eer_pages;
if (eerb->buffer_page_count < 1 || if (eerb->buffer_page_count < 1 ||
eerb->buffer_page_count > INT_MAX / PAGE_SIZE) { eerb->buffer_page_count > INT_MAX / PAGE_SIZE) {
...@@ -544,7 +543,6 @@ static int dasd_eer_open(struct inode *inp, struct file *filp) ...@@ -544,7 +543,6 @@ static int dasd_eer_open(struct inode *inp, struct file *filp)
DBF_EVENT(DBF_WARNING, "can't open device since module " DBF_EVENT(DBF_WARNING, "can't open device since module "
"parameter eer_pages is smaller than 1 or" "parameter eer_pages is smaller than 1 or"
" bigger than %d", (int)(INT_MAX / PAGE_SIZE)); " bigger than %d", (int)(INT_MAX / PAGE_SIZE));
unlock_kernel();
return -EINVAL; return -EINVAL;
} }
eerb->buffersize = eerb->buffer_page_count * PAGE_SIZE; eerb->buffersize = eerb->buffer_page_count * PAGE_SIZE;
...@@ -552,14 +550,12 @@ static int dasd_eer_open(struct inode *inp, struct file *filp) ...@@ -552,14 +550,12 @@ static int dasd_eer_open(struct inode *inp, struct file *filp)
GFP_KERNEL); GFP_KERNEL);
if (!eerb->buffer) { if (!eerb->buffer) {
kfree(eerb); kfree(eerb);
unlock_kernel();
return -ENOMEM; return -ENOMEM;
} }
if (dasd_eer_allocate_buffer_pages(eerb->buffer, if (dasd_eer_allocate_buffer_pages(eerb->buffer,
eerb->buffer_page_count)) { eerb->buffer_page_count)) {
kfree(eerb->buffer); kfree(eerb->buffer);
kfree(eerb); kfree(eerb);
unlock_kernel();
return -ENOMEM; return -ENOMEM;
} }
filp->private_data = eerb; filp->private_data = eerb;
...@@ -567,7 +563,6 @@ static int dasd_eer_open(struct inode *inp, struct file *filp) ...@@ -567,7 +563,6 @@ static int dasd_eer_open(struct inode *inp, struct file *filp)
list_add(&eerb->list, &bufferlist); list_add(&eerb->list, &bufferlist);
spin_unlock_irqrestore(&bufferlock, flags); spin_unlock_irqrestore(&bufferlock, flags);
unlock_kernel();
return nonseekable_open(inp,filp); return nonseekable_open(inp,filp);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment