aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/md.c
diff options
context:
space:
mode:
authorShaohua Li <shli@fb.com>2017-10-18 22:08:13 -0700
committerShaohua Li <shli@fb.com>2017-11-01 21:32:22 -0700
commitefa4b77b00b56138fb7e68d2fe8fd1b3c15cd503 (patch)
treeb7b1b88aa4aacba1811efe5d495733008622b484 /drivers/md/md.c
parentraid1: prevent freeze_array/wait_all_barriers deadlock (diff)
downloadlinux-dev-efa4b77b00b56138fb7e68d2fe8fd1b3c15cd503.tar.xz
linux-dev-efa4b77b00b56138fb7e68d2fe8fd1b3c15cd503.zip
md: use lockdep_assert_held
lockdep_assert_held is a better way to assert lock held, and it works for UP. Signed-off-by: Shaohua Li <shli@fb.com>
Diffstat (limited to 'drivers/md/md.c')
-rw-r--r--drivers/md/md.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c
index d441b1d9846c..5a0ec1d1a6e8 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -2335,7 +2335,7 @@ static void export_array(struct mddev *mddev)
static bool set_in_sync(struct mddev *mddev)
{
- WARN_ON_ONCE(NR_CPUS != 1 && !spin_is_locked(&mddev->lock));
+ lockdep_assert_held(&mddev->lock);
if (!mddev->in_sync) {
mddev->sync_checkers++;
spin_unlock(&mddev->lock);
@@ -6749,7 +6749,7 @@ static int set_array_info(struct mddev *mddev, mdu_array_info_t *info)
void md_set_array_sectors(struct mddev *mddev, sector_t array_sectors)
{
- WARN(!mddev_is_locked(mddev), "%s: unlocked mddev!\n", __func__);
+ lockdep_assert_held(&mddev->reconfig_mutex);
if (mddev->external_size)
return;