Skip to content

Commit

Permalink
md: remove typedefs: r10bio_t -> struct r10bio and r1bio_t -> struct …
Browse files Browse the repository at this point in the history 
…r1bio

Signed-off-by: NeilBrown <neilb@suse.de>
  • Loading branch information
NeilBrown committed Oct 11, 2011
1 parent 2b8bf34 commit 9f2c9d1
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 76 deletions.
60 changes: 30 additions & 30 deletions drivers/md/raid1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static void lower_barrier(conf_t *conf);
static void * r1bio_pool_alloc(gfp_t gfp_flags, void *data)
{
struct pool_info *pi = data;
int size = offsetof(r1bio_t, bios[pi->raid_disks]);
int size = offsetof(struct r1bio, bios[pi->raid_disks]);

/* allocate a r1bio with room for raid_disks entries in the bios array */
return kzalloc(size, gfp_flags);
Expand All @@ -73,7 +73,7 @@ static void * r1buf_pool_alloc(gfp_t gfp_flags, void *data)
{
struct pool_info *pi = data;
struct page *page;
r1bio_t *r1_bio;
struct r1bio *r1_bio;
struct bio *bio;
int i, j;

Expand Down Expand Up @@ -139,7 +139,7 @@ static void r1buf_pool_free(void *__r1_bio, void *data)
{
struct pool_info *pi = data;
int i,j;
r1bio_t *r1bio = __r1_bio;
struct r1bio *r1bio = __r1_bio;

for (i = 0; i < RESYNC_PAGES; i++)
for (j = pi->raid_disks; j-- ;) {
Expand All @@ -154,7 +154,7 @@ static void r1buf_pool_free(void *__r1_bio, void *data)
r1bio_pool_free(r1bio, data);
}

static void put_all_bios(conf_t *conf, r1bio_t *r1_bio)
static void put_all_bios(conf_t *conf, struct r1bio *r1_bio)
{
int i;

Expand All @@ -166,15 +166,15 @@ static void put_all_bios(conf_t *conf, r1bio_t *r1_bio)
}
}

static void free_r1bio(r1bio_t *r1_bio)
static void free_r1bio(struct r1bio *r1_bio)
{
conf_t *conf = r1_bio->mddev->private;

put_all_bios(conf, r1_bio);
mempool_free(r1_bio, conf->r1bio_pool);
}

static void put_buf(r1bio_t *r1_bio)
static void put_buf(struct r1bio *r1_bio)
{
conf_t *conf = r1_bio->mddev->private;
int i;
Expand All @@ -190,7 +190,7 @@ static void put_buf(r1bio_t *r1_bio)
lower_barrier(conf);
}

static void reschedule_retry(r1bio_t *r1_bio)
static void reschedule_retry(struct r1bio *r1_bio)
{
unsigned long flags;
struct mddev *mddev = r1_bio->mddev;
Expand All @@ -210,7 +210,7 @@ static void reschedule_retry(r1bio_t *r1_bio)
* operation and are ready to return a success/failure code to the buffer
* cache layer.
*/
static void call_bio_endio(r1bio_t *r1_bio)
static void call_bio_endio(struct r1bio *r1_bio)
{
struct bio *bio = r1_bio->master_bio;
int done;
Expand All @@ -237,7 +237,7 @@ static void call_bio_endio(r1bio_t *r1_bio)
}
}

static void raid_end_bio_io(r1bio_t *r1_bio)
static void raid_end_bio_io(struct r1bio *r1_bio)
{
struct bio *bio = r1_bio->master_bio;

Expand All @@ -257,7 +257,7 @@ static void raid_end_bio_io(r1bio_t *r1_bio)
/*
* Update disk head position estimator based on IRQ completion info.
*/
static inline void update_head_pos(int disk, r1bio_t *r1_bio)
static inline void update_head_pos(int disk, struct r1bio *r1_bio)
{
conf_t *conf = r1_bio->mddev->private;

Expand All @@ -268,7 +268,7 @@ static inline void update_head_pos(int disk, r1bio_t *r1_bio)
/*
* Find the disk number which triggered given bio
*/
static int find_bio_disk(r1bio_t *r1_bio, struct bio *bio)
static int find_bio_disk(struct r1bio *r1_bio, struct bio *bio)
{
int mirror;
int raid_disks = r1_bio->mddev->raid_disks;
Expand All @@ -286,7 +286,7 @@ static int find_bio_disk(r1bio_t *r1_bio, struct bio *bio)
static void raid1_end_read_request(struct bio *bio, int error)
{
int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags);
r1bio_t *r1_bio = bio->bi_private;
struct r1bio *r1_bio = bio->bi_private;
int mirror;
conf_t *conf = r1_bio->mddev->private;

Expand Down Expand Up @@ -333,7 +333,7 @@ static void raid1_end_read_request(struct bio *bio, int error)
rdev_dec_pending(conf->mirrors[mirror].rdev, conf->mddev);
}

static void close_write(r1bio_t *r1_bio)
static void close_write(struct r1bio *r1_bio)
{
/* it really is the end of this request */
if (test_bit(R1BIO_BehindIO, &r1_bio->state)) {
Expand All @@ -352,7 +352,7 @@ static void close_write(r1bio_t *r1_bio)
md_write_end(r1_bio->mddev);
}

static void r1_bio_write_done(r1bio_t *r1_bio)
static void r1_bio_write_done(struct r1bio *r1_bio)
{
if (!atomic_dec_and_test(&r1_bio->remaining))
return;
Expand All @@ -371,7 +371,7 @@ static void r1_bio_write_done(r1bio_t *r1_bio)
static void raid1_end_write_request(struct bio *bio, int error)
{
int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags);
r1bio_t *r1_bio = bio->bi_private;
struct r1bio *r1_bio = bio->bi_private;
int mirror, behind = test_bit(R1BIO_BehindIO, &r1_bio->state);
conf_t *conf = r1_bio->mddev->private;
struct bio *to_put = NULL;
Expand Down Expand Up @@ -466,7 +466,7 @@ static void raid1_end_write_request(struct bio *bio, int error)
*
* The rdev for the device selected will have nr_pending incremented.
*/
static int read_balance(conf_t *conf, r1bio_t *r1_bio, int *max_sectors)
static int read_balance(conf_t *conf, struct r1bio *r1_bio, int *max_sectors)
{
const sector_t this_sector = r1_bio->sector;
int sectors;
Expand Down Expand Up @@ -764,7 +764,7 @@ static void unfreeze_array(conf_t *conf)

/* duplicate the data pages for behind I/O
*/
static void alloc_behind_pages(struct bio *bio, r1bio_t *r1_bio)
static void alloc_behind_pages(struct bio *bio, struct r1bio *r1_bio)
{
int i;
struct bio_vec *bvec;
Expand Down Expand Up @@ -800,7 +800,7 @@ static int make_request(struct mddev *mddev, struct bio * bio)
{
conf_t *conf = mddev->private;
mirror_info_t *mirror;
r1bio_t *r1_bio;
struct r1bio *r1_bio;
struct bio *read_bio;
int i, disks;
struct bitmap *bitmap;
Expand Down Expand Up @@ -1354,7 +1354,7 @@ static int raid1_remove_disk(struct mddev *mddev, int number)

static void end_sync_read(struct bio *bio, int error)
{
r1bio_t *r1_bio = bio->bi_private;
struct r1bio *r1_bio = bio->bi_private;

update_head_pos(r1_bio->read_disk, r1_bio);

Expand All @@ -1373,7 +1373,7 @@ static void end_sync_read(struct bio *bio, int error)
static void end_sync_write(struct bio *bio, int error)
{
int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags);
r1bio_t *r1_bio = bio->bi_private;
struct r1bio *r1_bio = bio->bi_private;
struct mddev *mddev = r1_bio->mddev;
conf_t *conf = mddev->private;
int mirror=0;
Expand Down Expand Up @@ -1433,7 +1433,7 @@ static int r1_sync_page_io(struct md_rdev *rdev, sector_t sector,
return 0;
}

static int fix_sync_read_error(r1bio_t *r1_bio)
static int fix_sync_read_error(struct r1bio *r1_bio)
{
/* Try some synchronous reads of other devices to get
* good data, much like with normal read errors. Only
Expand Down Expand Up @@ -1553,7 +1553,7 @@ static int fix_sync_read_error(r1bio_t *r1_bio)
return 1;
}

static int process_checks(r1bio_t *r1_bio)
static int process_checks(struct r1bio *r1_bio)
{
/* We have read all readable devices. If we haven't
* got the block, then there is no hope left.
Expand Down Expand Up @@ -1635,7 +1635,7 @@ static int process_checks(r1bio_t *r1_bio)
return 0;
}

static void sync_request_write(struct mddev *mddev, r1bio_t *r1_bio)
static void sync_request_write(struct mddev *mddev, struct r1bio *r1_bio)
{
conf_t *conf = mddev->private;
int i;
Expand Down Expand Up @@ -1790,7 +1790,7 @@ static int submit_bio_wait(int rw, struct bio *bio)
return test_bit(BIO_UPTODATE, &bio->bi_flags);
}

static int narrow_write_error(r1bio_t *r1_bio, int i)
static int narrow_write_error(struct r1bio *r1_bio, int i)
{
struct mddev *mddev = r1_bio->mddev;
conf_t *conf = mddev->private;
Expand Down Expand Up @@ -1866,7 +1866,7 @@ static int narrow_write_error(r1bio_t *r1_bio, int i)
return ok;
}

static void handle_sync_write_finished(conf_t *conf, r1bio_t *r1_bio)
static void handle_sync_write_finished(conf_t *conf, struct r1bio *r1_bio)
{
int m;
int s = r1_bio->sectors;
Expand All @@ -1889,7 +1889,7 @@ static void handle_sync_write_finished(conf_t *conf, r1bio_t *r1_bio)
md_done_sync(conf->mddev, s, 1);
}

static void handle_write_finished(conf_t *conf, r1bio_t *r1_bio)
static void handle_write_finished(conf_t *conf, struct r1bio *r1_bio)
{
int m;
for (m = 0; m < conf->raid_disks ; m++)
Expand Down Expand Up @@ -1918,7 +1918,7 @@ static void handle_write_finished(conf_t *conf, r1bio_t *r1_bio)
raid_end_bio_io(r1_bio);
}

static void handle_read_error(conf_t *conf, r1bio_t *r1_bio)
static void handle_read_error(conf_t *conf, struct r1bio *r1_bio)
{
int disk;
int max_sectors;
Expand Down Expand Up @@ -2010,7 +2010,7 @@ static void handle_read_error(conf_t *conf, r1bio_t *r1_bio)

static void raid1d(struct mddev *mddev)
{
r1bio_t *r1_bio;
struct r1bio *r1_bio;
unsigned long flags;
conf_t *conf = mddev->private;
struct list_head *head = &conf->retry_list;
Expand All @@ -2029,7 +2029,7 @@ static void raid1d(struct mddev *mddev)
spin_unlock_irqrestore(&conf->device_lock, flags);
break;
}
r1_bio = list_entry(head->prev, r1bio_t, retry_list);
r1_bio = list_entry(head->prev, struct r1bio, retry_list);
list_del(head->prev);
conf->nr_queued--;
spin_unlock_irqrestore(&conf->device_lock, flags);
Expand Down Expand Up @@ -2088,7 +2088,7 @@ static int init_resync(conf_t *conf)
static sector_t sync_request(struct mddev *mddev, sector_t sector_nr, int *skipped, int go_faster)
{
conf_t *conf = mddev->private;
r1bio_t *r1_bio;
struct r1bio *r1_bio;
struct bio *bio;
sector_t max_sector, nr_sectors;
int disk = -1;
Expand Down
15 changes: 6 additions & 9 deletions drivers/md/raid1.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ struct pool_info {
int raid_disks;
};


typedef struct r1bio_s r1bio_t;

struct r1_private_data_s {
struct mddev *mddev;
mirror_info_t *mirrors;
Expand All @@ -43,9 +40,9 @@ struct r1_private_data_s {

spinlock_t device_lock;

/* list of 'r1bio_t' that need to be processed by raid1d, whether
* to retry a read, writeout a resync or recovery block, or
* anything else.
/* list of 'struct r1bio' that need to be processed by raid1d,
* whether to retry a read, writeout a resync or recovery
* block, or anything else.
*/
struct list_head retry_list;

Expand Down Expand Up @@ -80,8 +77,8 @@ struct r1_private_data_s {
* mempools - it changes when the array grows or shrinks
*/
struct pool_info *poolinfo;
mempool_t *r1bio_pool;
mempool_t *r1buf_pool;
mempool_t *r1bio_pool;
mempool_t *r1buf_pool;

/* temporary buffer to synchronous IO when attempting to repair
* a read error.
Expand All @@ -104,7 +101,7 @@ typedef struct r1_private_data_s conf_t;
* for this RAID1 operation, and about their status:
*/

struct r1bio_s {
struct r1bio {
atomic_t remaining; /* 'have we finished' count,
* used from IRQ handlers
*/
Expand Down
Loading

0 comments on commit 9f2c9d1

Please sign in to comment.