Commit f72ffdd6 authored by NeilBrown's avatar NeilBrown
Browse files

md: remove unwanted white space from md.c 



My editor shows much of this is RED.

Signed-off-by: default avatarNeilBrown <neilb@suse.de>
parent ac05f256

drivers/md/linear.c

+3 −5
Original line number Diff line number Diff line
@@ -355,7 +355,6 @@ static void linear_status (struct seq_file *seq, struct mddev *mddev) 
	seq_printf(seq, " %dk rounding", mddev->chunk_sectors / 2);

}





static struct md_personality linear_personality =

{

	.name		= "linear",
@@ -379,7 +378,6 @@ static void linear_exit (void) 
	unregister_md_personality (&linear_personality);

}





module_init(linear_init);

module_exit(linear_exit);

MODULE_LICENSE("GPL");

drivers/md/md.c

+74 −101
Original line number Diff line number Diff line
@@ -218,7 +218,6 @@ static void md_new_event_inintr(struct mddev *mddev) 
static LIST_HEAD(all_mddevs);

static DEFINE_SPINLOCK(all_mddevs_lock);





/*

 * iterates through all used mddevs in the system.

 * We take care to grab the all_mddevs_lock whenever navigating
@@ -241,7 +240,6 @@ static DEFINE_SPINLOCK(all_mddevs_lock); 
		_tmp = _tmp->next;})					\

		)





/* Rather than calling directly into the personality make_request function,

 * IO requests come here first so that we can check if the device is

 * being suspended pending a reconfiguration.
@@ -793,7 +791,6 @@ static int read_disk_sb(struct md_rdev * rdev, int size) 
	if (rdev->sb_loaded)

		return 0;





	if (!sync_page_io(rdev, 0, size, rdev->sb_page, READ, true))

		goto fail;

	rdev->sb_loaded = 1;
@@ -843,7 +840,6 @@ static int sb_equal(mdp_super_t *sb1, mdp_super_t *sb2) 
	return ret;

}





static u32 md_csum_fold(u32 csum)

{

	csum = (csum & 0xffff) + (csum >> 16);
@@ -864,7 +860,6 @@ static unsigned int calc_sb_csum(mdp_super_t * sb) 
		newcsum += sb32[i];

	csum = (newcsum & 0xffffffff) + (newcsum>>32);





#ifdef CONFIG_ALPHA

	/* This used to use csum_partial, which was wrong for several

	 * reasons including that different results are returned on
@@ -881,7 +876,6 @@ static unsigned int calc_sb_csum(mdp_super_t * sb) 
	return csum;

}





/*

 * Handle superblock details.

 * We want to be able to handle multiple superblock formats
@@ -1179,7 +1173,6 @@ static void super_90_sync(struct mddev *mddev, struct md_rdev *rdev) 
	struct md_rdev *rdev2;

	int next_spare = mddev->raid_disks;





	/* make rdev->sb match mddev data..

	 *

	 * 1/ zero out disks
@@ -1412,7 +1405,6 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_ 
	ret = read_disk_sb(rdev, 4096);

	if (ret) return ret;





	sb = page_address(rdev->sb_page);



	if (sb->magic != cpu_to_le32(MD_SB_MAGIC) ||
@@ -2328,7 +2320,6 @@ static void md_print_devices(void) 
	printk("\n");

}





static void sync_sbs(struct mddev *mddev, int nospares)

{

	/* Update each superblock (in-memory image), but
@@ -2812,7 +2803,6 @@ slot_store(struct md_rdev *rdev, const char *buf, size_t len) 
	return len;

}





static struct rdev_sysfs_entry rdev_slot =

__ATTR(slot, S_IRUGO|S_IWUSR, slot_show, slot_store);
@@ -3009,7 +2999,6 @@ rdev_size_store(struct md_rdev *rdev, const char *buf, size_t len) 
static struct rdev_sysfs_entry rdev_size =

__ATTR(size, S_IRUGO|S_IWUSR, rdev_size_show, rdev_size_store);





static ssize_t recovery_start_show(struct md_rdev *rdev, char *page)

{

	unsigned long long recovery_start = rdev->recovery_offset;
@@ -3045,7 +3034,6 @@ static ssize_t recovery_start_store(struct md_rdev *rdev, const char *buf, size_ 
static struct rdev_sysfs_entry rdev_recovery_start =

__ATTR(recovery_start, S_IRUGO|S_IWUSR, recovery_start_show, recovery_start_store);





static ssize_t

badblocks_show(struct badblocks *bb, char *page, int unack);

static ssize_t
@@ -3066,7 +3054,6 @@ static ssize_t bb_store(struct md_rdev *rdev, const char *page, size_t len) 
static struct rdev_sysfs_entry rdev_bad_blocks =

__ATTR(bad_blocks, S_IRUGO|S_IWUSR, bb_show, bb_store);





static ssize_t ubb_show(struct md_rdev *rdev, char *page)

{

	return badblocks_show(&rdev->badblocks, page, 1);
@@ -3263,7 +3250,6 @@ static struct md_rdev *md_import_device(dev_t newdev, int super_format, int supe 
 * Check a full RAID array for plausibility

 */





static void analyze_sbs(struct mddev *mddev)

{

	int i;
@@ -3287,7 +3273,6 @@ static void analyze_sbs(struct mddev * mddev) 
			kick_rdev_from_array(rdev);

		}





	super_types[mddev->major_version].

		validate_super(mddev, freshest);
@@ -3363,7 +3348,6 @@ int strict_strtoul_scaled(const char *cp, unsigned long *res, int scale) 
	return 0;

}





static void md_safemode_timeout(unsigned long data);



static ssize_t
@@ -3593,7 +3577,6 @@ level_store(struct mddev *mddev, const char *buf, size_t len) 
static struct md_sysfs_entry md_level =

__ATTR(level, S_IRUGO|S_IWUSR, level_show, level_store);





static ssize_t

layout_show(struct mddev *mddev, char *page)

{
@@ -3636,7 +3619,6 @@ layout_store(struct mddev *mddev, const char *buf, size_t len) 
static struct md_sysfs_entry md_layout =

__ATTR(layout, S_IRUGO|S_IWUSR, layout_show, layout_store);





static ssize_t

raid_disks_show(struct mddev *mddev, char *page)

{
@@ -3994,7 +3976,6 @@ new_dev_store(struct mddev *mddev, const char *buf, size_t len) 
	    minor != MINOR(dev))

		return -EOVERFLOW;





	if (mddev->persistent) {

		rdev = md_import_device(dev, mddev->major_version,

					mddev->minor_version);
@@ -4090,7 +4071,6 @@ size_store(struct mddev *mddev, const char *buf, size_t len) 
static struct md_sysfs_entry md_size =

__ATTR(component_size, S_IRUGO|S_IWUSR, size_show, size_store);





/* Metadata version.

 * This is one of

 *   'none' for arrays with no metadata (good luck...)
@@ -4492,7 +4472,6 @@ suspend_lo_store(struct mddev *mddev, const char *buf, size_t len) 
static struct md_sysfs_entry md_suspend_lo =

__ATTR(suspend_lo, S_IRUGO|S_IWUSR, suspend_lo_show, suspend_lo_store);





static ssize_t

suspend_hi_show(struct mddev *mddev, char *page)

{
@@ -4680,7 +4659,6 @@ static struct attribute_group md_redundancy_group = { 
	.attrs = md_redundancy_attrs,

};





static ssize_t

md_attr_show(struct kobject *kobj, struct attribute *attr, char *page)

{
@@ -5950,7 +5928,6 @@ static int set_bitmap_file(struct mddev *mddev, int fd) 
		/* we should be able to change the bitmap.. */

	}





	if (fd >= 0) {

		struct inode *inode;

		if (mddev->bitmap)
@@ -6178,7 +6155,6 @@ static int update_raid_disks(struct mddev *mddev, int raid_disks) 
	return rv;

}





/*

 * update_array_info is used to change the configuration of an

 * on-line array.
@@ -6880,7 +6856,6 @@ static void status_unused(struct seq_file *seq) 
	seq_printf(seq, "\n");

}





static void status_resync(struct seq_file *seq, struct mddev *mddev)

{

	sector_t max_sectors, resync, res;
@@ -7260,7 +7235,6 @@ void md_done_sync(struct mddev *mddev, int blocks, int ok) 
	}

}





/* md_write_start(mddev, bi)

 * If we need to update some array metadata (e.g. 'active' flag

 * in superblock) before writing, schedule a superblock update
@@ -8637,7 +8611,6 @@ void md_autodetect_dev(dev_t dev) 
	}

}





static void autostart_arrays(int part)

{

	struct md_rdev *rdev;

drivers/md/md.h

+16 −18
Original line number Diff line number Diff line
@@ -439,7 +439,6 @@ struct mddev { 
	void (*sync_super)(struct mddev *mddev, struct md_rdev *rdev);

};





static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)

{

	int faulty = test_bit(Faulty, &rdev->flags);
@@ -493,7 +492,6 @@ struct md_personality 
	void *(*takeover) (struct mddev *mddev);

};





struct md_sysfs_entry {

	struct attribute attr;

	ssize_t (*show)(struct mddev *, char *);

drivers/md/multipath.c

+11 −17
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 


#define	NR_RESERVED_BUFS	32





static int multipath_map (struct mpconf *conf)

{

	int i, disks = conf->raid_disks;
@@ -68,7 +67,6 @@ static void multipath_reschedule_retry (struct multipath_bh *mp_bh) 
	md_wakeup_thread(mddev->thread);

}





/*

 * multipath_end_bh_io() is called when we have finished servicing a multipathed

 * operation and are ready to return a success/failure code to the buffer
@@ -242,7 +240,6 @@ static void print_multipath_conf (struct mpconf *conf) 
	}

}





static int multipath_add_disk(struct mddev *mddev, struct md_rdev *rdev)

{

	struct mpconf *conf = mddev->private;
@@ -325,8 +322,6 @@ static int multipath_remove_disk(struct mddev *mddev, struct md_rdev *rdev) 
	return err;

}







/*

 * This is a kernel thread which:

 *
@@ -512,7 +507,6 @@ static int multipath_run (struct mddev *mddev) 
	return -EIO;

}





static int multipath_stop (struct mddev *mddev)

{

	struct mpconf *conf = mddev->private;

drivers/md/raid0.c

+4 −5
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
	     <maz@gloups.fdn.fr>

	     Copyright (C) 1999, 2000 Ingo Molnar, Red Hat





   RAID-0 management functions.



   This program is free software; you can redistribute it and/or modify