From f42df483e50f7215e13843acccff87747e0f6171 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Fri, 8 Dec 2006 02:36:17 -0800
Subject: [PATCH] --- yaml --- r: 43505 b: refs/heads/master c:
 d63a5a74dee87883fda6b7d170244acaac5b05e8 h: refs/heads/master i:   43503:
 103c8f04c0902bea3608a7eda9ec02892649dc07 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/md/md.c       | 2 +-
 trunk/include/linux/mutex.h | 2 ++
 trunk/kernel/mutex.c        | 9 +++++++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 90532d3b3b59..ecb7af2b7571 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6796bf54a64df36f96a42ae222423fffe36c58a5
+refs/heads/master: d63a5a74dee87883fda6b7d170244acaac5b05e8
diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c
index d2bcb410e3ab..3ce7a5d81d81 100644
--- a/trunk/drivers/md/md.c
+++ b/trunk/drivers/md/md.c
@@ -4423,7 +4423,7 @@ static int md_open(struct inode *inode, struct file *file)
 	mddev_t *mddev = inode->i_bdev->bd_disk->private_data;
 	int err;
 
-	if ((err = mddev_lock(mddev)))
+	if ((err = mutex_lock_interruptible_nested(&mddev->reconfig_mutex, 1)))
 		goto out;
 
 	err = 0;
diff --git a/trunk/include/linux/mutex.h b/trunk/include/linux/mutex.h
index b2b91c477563..a7544afd7582 100644
--- a/trunk/include/linux/mutex.h
+++ b/trunk/include/linux/mutex.h
@@ -125,8 +125,10 @@ extern int fastcall mutex_lock_interruptible(struct mutex *lock);
 
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
 extern void mutex_lock_nested(struct mutex *lock, unsigned int subclass);
+extern int mutex_lock_interruptible_nested(struct mutex *lock, unsigned int subclass);
 #else
 # define mutex_lock_nested(lock, subclass) mutex_lock(lock)
+# define mutex_lock_interruptible_nested(lock, subclass) mutex_lock_interruptible(lock)
 #endif
 
 /*
diff --git a/trunk/kernel/mutex.c b/trunk/kernel/mutex.c
index 8c71cf72a497..e7cbbb82765b 100644
--- a/trunk/kernel/mutex.c
+++ b/trunk/kernel/mutex.c
@@ -206,6 +206,15 @@ mutex_lock_nested(struct mutex *lock, unsigned int subclass)
 }
 
 EXPORT_SYMBOL_GPL(mutex_lock_nested);
+
+int __sched
+mutex_lock_interruptible_nested(struct mutex *lock, unsigned int subclass)
+{
+	might_sleep();
+	return __mutex_lock_common(lock, TASK_INTERRUPTIBLE, subclass);
+}
+
+EXPORT_SYMBOL_GPL(mutex_lock_interruptible_nested);
 #endif
 
 /*