summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsicam.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-03-24 08:25:26 +0100
committerJens Axboe <axboe@kernel.dk>2020-03-24 07:57:08 -0600
commit1442f76d4317b420580e11238d20789708c742a4 (patch)
tree86d763c8dd427a3a7b868906b77a36f888201832 /drivers/scsi/scsicam.c
parentcbb5cb3b29f9eb158bd2db39cdc07db6d8087461 (diff)
downloadlinux-stable-1442f76d4317b420580e11238d20789708c742a4.tar.gz
linux-stable-1442f76d4317b420580e11238d20789708c742a4.tar.bz2
linux-stable-1442f76d4317b420580e11238d20789708c742a4.zip
block: move struct partition out of genhd.h
struct partition is the on-disk format of a MSDOS partition table entry. Move it out of genhd.h into a new msdos_partition.h header and give it a msdos_ prefix to avoid confusion. Also move the magic number from block/partitions/msdos.h to the new header so that it can be used by the SCSI drivers looking at the DOS partition tables. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/scsi/scsicam.c')
-rw-r--r--drivers/scsi/scsicam.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/scsicam.c b/drivers/scsi/scsicam.c
index 665d7db2f94c..682cf08ab041 100644
--- a/drivers/scsi/scsicam.c
+++ b/drivers/scsi/scsicam.c
@@ -17,6 +17,7 @@
#include <linux/genhd.h>
#include <linux/kernel.h>
#include <linux/blkdev.h>
+#include <linux/msdos_partition.h>
#include <asm/unaligned.h>
#include <scsi/scsicam.h>
@@ -61,7 +62,7 @@ bool scsi_partsize(struct block_device *bdev, sector_t capacity, int geom[3])
{
int cyl, ext_cyl, end_head, end_cyl, end_sector;
unsigned int logical_end, physical_end, ext_physical_end;
- struct partition *p, *largest = NULL;
+ struct msdos_partition *p, *largest = NULL;
void *buf;
int ret = false;