drbd: Rename "mdev" to "device"

[deliverable/linux.git] / drivers / block / drbd / drbd_wrappers.h

diff --git a/drivers/block/drbd/drbd_wrappers.h b/drivers/block/drbd/drbd_wrappers.h
index ee6362a203a1b608f24b08e3de4397342480094e..3db9ebaf64f6c076b0e24502be6abbe966f97376 100644 (file)
--- a/drivers/block/drbd/drbd_wrappers.h
+++ b/drivers/block/drbd/drbd_wrappers.h
@@ -9,12 +9,12 @@
 extern char *drbd_sec_holder;
 
 /* sets the number of 512 byte sectors of our virtual device */
-static inline void drbd_set_my_capacity(struct drbd_device *mdev,
+static inline void drbd_set_my_capacity(struct drbd_device *device,
                                        sector_t size)
 {
-       /* set_capacity(mdev->this_bdev->bd_disk, size); */
-       set_capacity(mdev->vdisk, size);
-       mdev->this_bdev->bd_inode->i_size = (loff_t)size << 9;
+       /* set_capacity(device->this_bdev->bd_disk, size); */
+       set_capacity(device->vdisk, size);
+       device->this_bdev->bd_inode->i_size = (loff_t)size << 9;
 }
 
 #define drbd_bio_uptodate(bio) bio_flagged(bio, BIO_UPTODATE)
@@ -27,20 +27,20 @@ extern void drbd_request_endio(struct bio *bio, int error);
 /*
  * used to submit our private bio
  */
-static inline void drbd_generic_make_request(struct drbd_device *mdev,
+static inline void drbd_generic_make_request(struct drbd_device *device,
                                             int fault_type, struct bio *bio)
 {
        __release(local);
        if (!bio->bi_bdev) {
                printk(KERN_ERR "drbd%d: drbd_generic_make_request: "
                                "bio->bi_bdev == NULL\n",
-                      mdev_to_minor(mdev));
+                      device_to_minor(device));
                dump_stack();
                bio_endio(bio, -ENODEV);
                return;
        }
 
-       if (drbd_insert_fault(mdev, fault_type))
+       if (drbd_insert_fault(device, fault_type))
                bio_endio(bio, -EIO);
        else
                generic_make_request(bio);