diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-11-27 13:49:18 -0500 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-11-27 13:49:18 -0500 |
| commit | f30195c50245d8ace628e1978b1daa8df86e7224 (patch) | |
| tree | edf4f91c4356c41d50fb07f15cebd1e6442538ad /drivers/block/drbd/drbd_int.h | |
| parent | d07335e51df0c6dec202d315fc4f1f7e100eec4e (diff) | |
| parent | d4d77629953eabd3c14f6fa5746f6b28babfc55f (diff) | |
Merge branch 'cleanup-bd_claim' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into for-2.6.38/core
Diffstat (limited to 'drivers/block/drbd/drbd_int.h')
| -rw-r--r-- | drivers/block/drbd/drbd_int.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h index 1ea1a34e78b2..3803a0348937 100644 --- a/drivers/block/drbd/drbd_int.h +++ b/drivers/block/drbd/drbd_int.h | |||
| @@ -911,8 +911,6 @@ struct drbd_md { | |||
| 911 | struct drbd_backing_dev { | 911 | struct drbd_backing_dev { |
| 912 | struct block_device *backing_bdev; | 912 | struct block_device *backing_bdev; |
| 913 | struct block_device *md_bdev; | 913 | struct block_device *md_bdev; |
| 914 | struct file *lo_file; | ||
| 915 | struct file *md_file; | ||
| 916 | struct drbd_md md; | 914 | struct drbd_md md; |
| 917 | struct disk_conf dc; /* The user provided config... */ | 915 | struct disk_conf dc; /* The user provided config... */ |
| 918 | sector_t known_size; /* last known size of that backing device */ | 916 | sector_t known_size; /* last known size of that backing device */ |