OSDN Git Service

md: move revalidate_disk() back outside open_mutex
authorDan Williams <dan.j.williams@intel.com>
Sat, 7 Aug 2010 01:01:59 +0000 (18:01 -0700)
committerNeilBrown <neilb@suse.de>
Sun, 8 Aug 2010 11:20:17 +0000 (21:20 +1000)
commit147e0b6a639ac581ca3bf627bedc3f4a6d3eca66
tree95ca7cb3b2f06586d678ec33c0e9910d11f3af42
parent51e9ac77035a3dfcb6fc0a88a0d80b6f99b5edb1
md: move revalidate_disk() back outside open_mutex

Commit b821eaa5 "md: remove ->changed and related code" moved
revalidate_disk() under open_mutex, and lockdep noticed.

[ INFO: possible circular locking dependency detected ]
2.6.32-mdadm-locking #1
-------------------------------------------------------
mdadm/3640 is trying to acquire lock:
 (&bdev->bd_mutex){+.+.+.}, at: [<ffffffff811acecb>] revalidate_disk+0x5b/0x90

but task is already holding lock:
 (&mddev->open_mutex){+.+...}, at: [<ffffffffa055e07a>] do_md_stop+0x4a/0x4d0 [md_mod]

which lock already depends on the new lock.

It is suitable for 2.6.35.x

Cc: <stable@kernel.org>
Reported-by: Przemyslaw Czarnowski <przemyslaw.hawrylewicz.czarnowski@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
drivers/md/md.c