Commit 5c47daf6 authored by NeilBrown's avatar NeilBrown
Browse files

md: move mddev_lock and related to md.h 



The one which is not inline (mddev_unlock) gets EXPORTed.

This makes the locking available to personality modules so that it
doesn't have to be imposed upon them.

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

drivers/md/md.c

+2 −24
Original line number Diff line number Diff line
@@ -590,32 +590,9 @@ static struct mddev *mddev_find(dev_t unit) 
	goto retry;

}



static inline int __must_check mddev_lock(struct mddev *mddev)

{

	return mutex_lock_interruptible(&mddev->reconfig_mutex);

}



/* Sometimes we need to take the lock in a situation where

 * failure due to interrupts is not acceptable.

 */

static inline void mddev_lock_nointr(struct mddev *mddev)

{

	mutex_lock(&mddev->reconfig_mutex);

}



static inline int mddev_is_locked(struct mddev *mddev)

{

	return mutex_is_locked(&mddev->reconfig_mutex);

}



static inline int mddev_trylock(struct mddev *mddev)

{

	return mutex_trylock(&mddev->reconfig_mutex);

}



static struct attribute_group md_redundancy_group;



static void mddev_unlock(struct mddev *mddev)

void mddev_unlock(struct mddev *mddev)

{

	if (mddev->to_remove) {

		/* These cannot be removed under reconfig_mutex as
@@ -657,6 +634,7 @@ static void mddev_unlock(struct mddev *mddev) 
	md_wakeup_thread(mddev->thread);

	spin_unlock(&pers_lock);

}

EXPORT_SYMBOL_GPL(mddev_unlock);



static struct md_rdev *find_rdev_nr_rcu(struct mddev *mddev, int nr)

{

drivers/md/md.h

+24 −0
Original line number Diff line number Diff line
@@ -450,6 +450,30 @@ struct mddev { 
	void (*sync_super)(struct mddev *mddev, struct md_rdev *rdev);

};



static inline int __must_check mddev_lock(struct mddev *mddev)

{

	return mutex_lock_interruptible(&mddev->reconfig_mutex);

}



/* Sometimes we need to take the lock in a situation where

 * failure due to interrupts is not acceptable.

 */

static inline void mddev_lock_nointr(struct mddev *mddev)

{

	mutex_lock(&mddev->reconfig_mutex);

}



static inline int mddev_is_locked(struct mddev *mddev)

{

	return mutex_is_locked(&mddev->reconfig_mutex);

}



static inline int mddev_trylock(struct mddev *mddev)

{

	return mutex_trylock(&mddev->reconfig_mutex);

}

extern void mddev_unlock(struct mddev *mddev);



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

{

	int faulty = test_bit(Faulty, &rdev->flags);