md: Convert reconfig_sem to reconfig_mutex
PATCH 1/1 md: Convert reconfig_sem to reconfig_mutex
In reply to a message not in the archive... being careful that mutex_trylock is inverted wrt down_trylock
Signed-off-by Neil Brown <[email protected]>
### Diffstat output
./drivers/md/md.c | 14 +++++++------- ./include/linux/raid/md_k.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/md/md.c renamed from drivers/md/md.c~current~ +7 -7
@@ -254,7 +254,7 @@ static mddev_t * mddev_find(dev_t unit)else new->md_minor =MINOR (unit) >> MdpMinorShift; -init_MUTEX (&new->reconfig_sem); +mutex_init (&new->reconfig_mutex);INIT_LIST_HEAD (&new->disks);INIT_LIST_HEAD (&new->all_mddevs);init_timer (&new->safemode_timer);
@@ -276,22 +276,22 @@ static mddev_t * mddev_find(dev_t unit)static inline int mddev_lock (mddev_t * mddev) { -return down_interruptible (&mddev->reconfig_sem); +return mutex_lock_interruptible (&mddev->reconfig_mutex); }static inline void mddev_lock_uninterruptible (mddev_t * mddev) { -down (&mddev->reconfig_sem); +mutex_lock (&mddev->reconfig_mutex); }static inline int mddev_trylock (mddev_t * mddev) { -return down_trylock (&mddev->reconfig_sem); +return mutex_trylock (&mddev->reconfig_mutex); }static inline void mddev_unlock (mddev_t * mddev) { -up (&mddev->reconfig_sem); +mutex_unlock (&mddev->reconfig_mutex);md_wakeup_thread (mddev->thread); }
@@ -4892,7 +4892,7 @@ void md_check_recovery(mddev_t *mddev) ))return ; -if (mddev_trylock (mddev)==0 ) { +if (mddev_trylock (mddev)) {int spares =0 ;spin_lock_irq (&mddev->write_lock);
@@ -5028,7 +5028,7 @@ static int md_notify_reboot(struct notifprintk (KERN_INFO "md: stopping all md devices.\n" ); ITERATE_MDDEV(mddev,tmp) -if (mddev_trylock (mddev)==0 ) +if (mddev_trylock (mddev))do_md_stop (mddev,1 );/* * certain more exotic SCSI devices are known to be
include/linux/raid/md_k.h renamed from include/linux/raid/md_k.h~current~ +1 -1
@@ -185,7 +185,7 @@ struct mddev_sunsigned long recovery;int in_sync;/* know to not need resync */ -struct semaphore reconfig_sem; +struct mutex reconfig_mutex;atomic_t active;int changed;/* true if we might need to reread partition info */