X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fs390%2Fchar%2Fvmur.h;h=fa320ad4593d790fb34af20f27afb9c3825e8af4;hb=74c76c84576eb2d806f40f6cb2fc8302c01869d8;hp=2b3c564e04728f133d527a2d95a94ddbacd3fb7c;hpb=203f3394397642f2f9d9ee760f03420459b7a8ef;p=linux-2.6 diff --git a/drivers/s390/char/vmur.h b/drivers/s390/char/vmur.h index 2b3c564e04..fa320ad459 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; @@ -70,6 +69,10 @@ struct urdev { size_t reclen; /* Record length for *write* CCWs */ 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 */ }; /*