Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 115089
b: refs/heads/master
c: d710e13
h: refs/heads/master
i:
  115087: b45b2c8
v: v3
  • Loading branch information
NeilBrown committed Oct 13, 2008
1 parent 3623616 commit a9c92d2
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fb4d8c76e56a887b9eee99fbc55fe82b18625d30
refs/heads/master: d710e13812600037a723a673dc5c96a071de98d3
26 changes: 13 additions & 13 deletions trunk/drivers/md/md.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@


#ifndef MODULE
static void autostart_arrays (int part);
static void autostart_arrays(int part);
#endif

static LIST_HEAD(pers_list);
Expand Down Expand Up @@ -201,7 +201,7 @@ static DEFINE_SPINLOCK(all_mddevs_lock);
)


static int md_fail_request (struct request_queue *q, struct bio *bio)
static int md_fail_request(struct request_queue *q, struct bio *bio)
{
bio_io_error(bio);
return 0;
Expand Down Expand Up @@ -3962,10 +3962,10 @@ static void autorun_array(mddev_t *mddev)
}
printk("\n");

err = do_md_run (mddev);
err = do_md_run(mddev);
if (err) {
printk(KERN_WARNING "md: do_md_run() returned %d\n", err);
do_md_stop (mddev, 0, 0);
do_md_stop(mddev, 0, 0);
}
}

Expand Down Expand Up @@ -4324,7 +4324,7 @@ static int add_new_disk(mddev_t * mddev, mdu_disk_info_t *info)

if (!(info->state & (1<<MD_DISK_FAULTY))) {
int err;
rdev = md_import_device (dev, -1, 0);
rdev = md_import_device(dev, -1, 0);
if (IS_ERR(rdev)) {
printk(KERN_WARNING
"md: error, md_import_device() returned %ld\n",
Expand Down Expand Up @@ -4406,7 +4406,7 @@ static int hot_add_disk(mddev_t * mddev, dev_t dev)
return -EINVAL;
}

rdev = md_import_device (dev, -1, 0);
rdev = md_import_device(dev, -1, 0);
if (IS_ERR(rdev)) {
printk(KERN_WARNING
"md: error, md_import_device() returned %ld\n",
Expand Down Expand Up @@ -4925,11 +4925,11 @@ static int md_ioctl(struct inode *inode, struct file *file,
goto done_unlock;

case STOP_ARRAY:
err = do_md_stop (mddev, 0, 1);
err = do_md_stop(mddev, 0, 1);
goto done_unlock;

case STOP_ARRAY_RO:
err = do_md_stop (mddev, 1, 1);
err = do_md_stop(mddev, 1, 1);
goto done_unlock;

}
Expand Down Expand Up @@ -4978,7 +4978,7 @@ static int md_ioctl(struct inode *inode, struct file *file,
goto done_unlock;

case RUN_ARRAY:
err = do_md_run (mddev);
err = do_md_run(mddev);
goto done_unlock;

case SET_BITMAP_FILE:
Expand Down Expand Up @@ -5416,11 +5416,11 @@ static int md_seq_show(struct seq_file *seq, void *v)
seq_printf(seq, " super non-persistent");

if (mddev->pers) {
mddev->pers->status (seq, mddev);
mddev->pers->status(seq, mddev);
seq_printf(seq, "\n ");
if (mddev->pers->sync_request) {
if (mddev->curr_resync > 2) {
status_resync (seq, mddev);
status_resync(seq, mddev);
seq_printf(seq, "\n ");
} else if (mddev->curr_resync == 1 || mddev->curr_resync == 2)
seq_printf(seq, "\tresync=DELAYED\n ");
Expand Down Expand Up @@ -6251,7 +6251,7 @@ static int md_notify_reboot(struct notifier_block *this,
* appears to still be in use. Hence
* the '100'.
*/
do_md_stop (mddev, 1, 100);
do_md_stop(mddev, 1, 100);
mddev_unlock(mddev);
}
/*
Expand Down Expand Up @@ -6295,7 +6295,7 @@ static int __init md_init(void)
raid_table_header = register_sysctl_table(raid_root_table);

md_geninit();
return (0);
return 0;
}


Expand Down
30 changes: 15 additions & 15 deletions trunk/drivers/md/raid5.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ static int grow_buffers(struct stripe_head *sh, int num)
return 0;
}

static void raid5_build_block (struct stripe_head *sh, int i);
static void raid5_build_block(struct stripe_head *sh, int i);

static void init_stripe(struct stripe_head *sh, sector_t sector, int pd_idx, int disks)
{
Expand Down Expand Up @@ -1146,7 +1146,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
release_stripe(sh);
}

static void raid5_end_write_request (struct bio *bi, int error)
static void raid5_end_write_request(struct bio *bi, int error)
{
struct stripe_head *sh = bi->bi_private;
raid5_conf_t *conf = sh->raid_conf;
Expand Down Expand Up @@ -1178,7 +1178,7 @@ static void raid5_end_write_request (struct bio *bi, int error)

static sector_t compute_blocknr(struct stripe_head *sh, int i);

static void raid5_build_block (struct stripe_head *sh, int i)
static void raid5_build_block(struct stripe_head *sh, int i)
{
struct r5dev *dev = &sh->dev[i];

Expand Down Expand Up @@ -1216,10 +1216,10 @@ static void error(mddev_t *mddev, mdk_rdev_t *rdev)
set_bit(MD_RECOVERY_INTR, &mddev->recovery);
}
set_bit(Faulty, &rdev->flags);
printk (KERN_ALERT
"raid5: Disk failure on %s, disabling device.\n"
"raid5: Operation continuing on %d devices.\n",
bdevname(rdev->bdev,b), conf->raid_disks - mddev->degraded);
printk(KERN_ALERT
"raid5: Disk failure on %s, disabling device.\n"
"raid5: Operation continuing on %d devices.\n",
bdevname(rdev->bdev,b), conf->raid_disks - mddev->degraded);
}
}

Expand Down Expand Up @@ -1315,8 +1315,8 @@ static sector_t raid5_compute_sector(sector_t r_sector, unsigned int raid_disks,
*dd_idx = (*pd_idx + 2 + *dd_idx) % raid_disks;
break;
default:
printk (KERN_CRIT "raid6: unsupported algorithm %d\n",
conf->algorithm);
printk(KERN_CRIT "raid6: unsupported algorithm %d\n",
conf->algorithm);
}
break;
}
Expand Down Expand Up @@ -1391,16 +1391,16 @@ static sector_t compute_blocknr(struct stripe_head *sh, int i)
}
break;
default:
printk (KERN_CRIT "raid6: unsupported algorithm %d\n",
conf->algorithm);
printk(KERN_CRIT "raid6: unsupported algorithm %d\n",
conf->algorithm);
}
break;
}

chunk_number = stripe * data_disks + i;
r_sector = (sector_t)chunk_number * sectors_per_chunk + chunk_offset;

check = raid5_compute_sector (r_sector, raid_disks, data_disks, &dummy1, &dummy2, conf);
check = raid5_compute_sector(r_sector, raid_disks, data_disks, &dummy1, &dummy2, conf);
if (check != sh->sector || dummy1 != dd_idx || dummy2 != sh->pd_idx) {
printk(KERN_ERR "compute_blocknr: map not correct\n");
return 0;
Expand Down Expand Up @@ -4284,7 +4284,7 @@ static int stop(mddev_t *mddev)
}

#ifdef DEBUG
static void print_sh (struct seq_file *seq, struct stripe_head *sh)
static void print_sh(struct seq_file *seq, struct stripe_head *sh)
{
int i;

Expand All @@ -4300,7 +4300,7 @@ static void print_sh (struct seq_file *seq, struct stripe_head *sh)
seq_printf(seq, "\n");
}

static void printall (struct seq_file *seq, raid5_conf_t *conf)
static void printall(struct seq_file *seq, raid5_conf_t *conf)
{
struct stripe_head *sh;
struct hlist_node *hn;
Expand All @@ -4318,7 +4318,7 @@ static void printall (struct seq_file *seq, raid5_conf_t *conf)
}
#endif

static void status (struct seq_file *seq, mddev_t *mddev)
static void status(struct seq_file *seq, mddev_t *mddev)
{
raid5_conf_t *conf = (raid5_conf_t *) mddev->private;
int i;
Expand Down
10 changes: 5 additions & 5 deletions trunk/include/linux/raid/md.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,17 @@

extern int mdp_major;

extern int register_md_personality (struct mdk_personality *p);
extern int unregister_md_personality (struct mdk_personality *p);
extern mdk_thread_t * md_register_thread (void (*run) (mddev_t *mddev),
extern int register_md_personality(struct mdk_personality *p);
extern int unregister_md_personality(struct mdk_personality *p);
extern mdk_thread_t * md_register_thread(void (*run) (mddev_t *mddev),
mddev_t *mddev, const char *name);
extern void md_unregister_thread (mdk_thread_t *thread);
extern void md_unregister_thread(mdk_thread_t *thread);
extern void md_wakeup_thread(mdk_thread_t *thread);
extern void md_check_recovery(mddev_t *mddev);
extern void md_write_start(mddev_t *mddev, struct bio *bi);
extern void md_write_end(mddev_t *mddev);
extern void md_done_sync(mddev_t *mddev, int blocks, int ok);
extern void md_error (mddev_t *mddev, mdk_rdev_t *rdev);
extern void md_error(mddev_t *mddev, mdk_rdev_t *rdev);

extern void md_super_write(mddev_t *mddev, mdk_rdev_t *rdev,
sector_t sector, int size, struct page *page);
Expand Down

0 comments on commit a9c92d2

Please sign in to comment.