Skip to content

Commit

Permalink
block: kill disk_{check|set|clear|alloc}_badblocks
Browse files Browse the repository at this point in the history
These actions are completely managed by a block driver or can use the
badblocks api directly.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
  • Loading branch information
Dan Williams committed Jan 10, 2016
1 parent 710d69c commit 55f5560
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 47 deletions.
42 changes: 0 additions & 42 deletions block/genhd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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,
Expand Down
5 changes: 0 additions & 5 deletions include/linux/genhd.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 55f5560

Please sign in to comment.