Commit 55f5560d authored by Dan Williams's avatar Dan Williams
Browse files

block: kill disk_{check|set|clear|alloc}_badblocks 



These actions are completely managed by a block driver or can use the
badblocks api directly.

Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 710d69cc

block/genhd.c

+0 −42
Original line number Diff line number Diff line
@@ -506,16 +506,6 @@ static int exact_lock(dev_t devt, void *data) 
	return 0;

}



int disk_alloc_badblocks(struct gendisk *disk)

{

	disk->bb = kzalloc(sizeof(*(disk->bb)), GFP_KERNEL);

	if (!disk->bb)

		return -ENOMEM;



	return badblocks_init(disk->bb, 1);

}

EXPORT_SYMBOL(disk_alloc_badblocks);



static void register_disk(struct gendisk *disk)

{

	struct device *ddev = disk_to_dev(disk);
@@ -682,38 +672,6 @@ void del_gendisk(struct gendisk *disk) 
}

EXPORT_SYMBOL(del_gendisk);



/*

 * The gendisk usage of badblocks does not track acknowledgements for

 * badblocks. We always assume they are acknowledged.

 */

int disk_check_badblocks(struct gendisk *disk, sector_t s, int sectors,

		   sector_t *first_bad, int *bad_sectors)

{

	if (!disk->bb)

		return 0;



	return badblocks_check(disk->bb, s, sectors, first_bad, bad_sectors);

}

EXPORT_SYMBOL(disk_check_badblocks);



int disk_set_badblocks(struct gendisk *disk, sector_t s, int sectors)

{

	if (!disk->bb)

		return 0;



	return badblocks_set(disk->bb, s, sectors, 1);

}

EXPORT_SYMBOL(disk_set_badblocks);



int disk_clear_badblocks(struct gendisk *disk, sector_t s, int sectors)

{

	if (!disk->bb)

		return 0;



	return badblocks_clear(disk->bb, s, sectors);

}

EXPORT_SYMBOL(disk_clear_badblocks);



/* sysfs access to bad-blocks list. */

static ssize_t disk_badblocks_show(struct device *dev,

					struct device_attribute *attr,

include/linux/genhd.h

+0 −5
Original line number Diff line number Diff line
@@ -435,11 +435,6 @@ extern void add_disk(struct gendisk *disk); 
extern void del_gendisk(struct gendisk *gp);

extern struct gendisk *get_gendisk(dev_t dev, int *partno);

extern struct block_device *bdget_disk(struct gendisk *disk, int partno);

int disk_alloc_badblocks(struct gendisk *disk);

extern int disk_check_badblocks(struct gendisk *disk, sector_t s, int sectors,

		   sector_t *first_bad, int *bad_sectors);

extern int disk_set_badblocks(struct gendisk *disk, sector_t s, int sectors);

extern int disk_clear_badblocks(struct gendisk *disk, sector_t s, int sectors);



extern void set_device_ro(struct block_device *bdev, int flag);

extern void set_disk_ro(struct gendisk *disk, int flag);