X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fs390%2Fchar%2Fvmur.h;h=fa320ad4593d790fb34af20f27afb9c3825e8af4;hb=e496e3d645c93206faf61ff6005995ebd08cc39c;hp=fa959644735a7495451a3ea3dedaf920097033c3;hpb=519ef1af47bb7379c4c06aeba2d78073df92c151;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/s390/char/vmur.h b/drivers/s390/char/vmur.h
index fa959644735..fa320ad4593 100644
--- a/drivers/s390/char/vmur.h
+++ b/drivers/s390/char/vmur.h
@@ -62,7 +62,6 @@ struct file_control_block {
 struct urdev {
 	struct ccw_device *cdev;	/* Backpointer to ccw device */
 	struct mutex io_mutex;		/* Serialises device IO */
-	struct mutex open_mutex;	/* Serialises access to device */
 	struct completion *io_done;	/* do_ur_io waits; irq completes */
 	struct device *device;
 	struct cdev *char_device;
@@ -71,6 +70,9 @@ struct urdev {
 	int class;			/* VM device class */
 	int io_request_rc;		/* return code from I/O request */
 	atomic_t ref_count;		/* reference counter */
+	wait_queue_head_t wait;		/* wait queue to serialize open */
+	int open_flag;			/* "urdev is open" flag */
+	spinlock_t open_lock;		/* serialize critical sections */
 };
 
 /*