---

yaml
---
r: 173295
b: refs/heads/master
c: 5e24eb0
h: refs/heads/master
i:
  173293: 09cc916
  173291: 2ba5d88
  173287: 36cc122
  173279: 11595bd
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b47f9d5ec646bc50148c664ce5895ff9837699f
+refs/heads/master: 5e24eb08e8f4df1f6ef913b6ff94c16b9c51d85a

trunk/drivers/s390/block/dasd_eer.c

@@ -536,38 +536,33 @@ static int dasd_eer_open(struct inode *inp, struct file *filp)
 	eerb = kzalloc(sizeof(struct eerbuffer), GFP_KERNEL);
 	if (!eerb)
 		return -ENOMEM;
-	lock_kernel();
 	eerb->buffer_page_count = eer_pages;
 	if (eerb->buffer_page_count < 1 ||
 	    eerb->buffer_page_count > INT_MAX / PAGE_SIZE) {
 		kfree(eerb);
 		DBF_EVENT(DBF_WARNING, "can't open device since module "
 			"parameter eer_pages is smaller than 1 or"
 			" bigger than %d", (int)(INT_MAX / PAGE_SIZE));
-		unlock_kernel();
 		return -EINVAL;
 	}
 	eerb->buffersize = eerb->buffer_page_count * PAGE_SIZE;
 	eerb->buffer = kmalloc(eerb->buffer_page_count * sizeof(char *),
 			       GFP_KERNEL);
         if (!eerb->buffer) {
 		kfree(eerb);
-		unlock_kernel();
                 return -ENOMEM;
 	}
 	if (dasd_eer_allocate_buffer_pages(eerb->buffer,
 					   eerb->buffer_page_count)) {
 		kfree(eerb->buffer);
 		kfree(eerb);
-		unlock_kernel();
 		return -ENOMEM;
 	}
 	filp->private_data = eerb;
 	spin_lock_irqsave(&bufferlock, flags);
 	list_add(&eerb->list, &bufferlist);
 	spin_unlock_irqrestore(&bufferlock, flags);
 
-	unlock_kernel();
 	return nonseekable_open(inp,filp);
 }