From 76d44c938f509d85ff245e93cd166953a968542d Mon Sep 17 00:00:00 2001
From: Steven Rostedt <rostedt@goodmis.org>
Date: Mon, 22 Aug 2011 11:52:28 +0800
Subject: [PATCH] --- yaml --- r: 287759 b: refs/heads/master c:
 1d6f2097865e64963e90cce04980dce2f9fc023f h: refs/heads/master i:   287757:
 4f03cdc893ba901d3a8da8012843e2aef53c3ff3   287755:
 0cbaa39976d5f1d3e70195280c01530558545cb4   287751:
 34550f6fc5249aee475d9d4b2e4a2fc59e309a40   287743:
 4f58ce1bbf10f99c33a162bc9a5cbb662052a2a7 v: v3

---
 [refs]                    | 2 +-
 trunk/fs/autofs4/expire.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6b2c4a9b4522..47e388565148 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e188dc02d3a9c911be56eca5aa114fe7e9822d53
+refs/heads/master: 1d6f2097865e64963e90cce04980dce2f9fc023f
diff --git a/trunk/fs/autofs4/expire.c b/trunk/fs/autofs4/expire.c
index 450f529a4eae..1feb68ecef95 100644
--- a/trunk/fs/autofs4/expire.c
+++ b/trunk/fs/autofs4/expire.c
@@ -124,6 +124,7 @@ static struct dentry *get_next_positive_subdir(struct dentry *prev,
 	/* Negative dentry - try next */
 	if (!simple_positive(q)) {
 		spin_unlock(&p->d_lock);
+		lock_set_subclass(&q->d_lock.dep_map, 0, _RET_IP_);
 		p = q;
 		goto again;
 	}
@@ -186,6 +187,7 @@ static struct dentry *get_next_positive_dentry(struct dentry *prev,
 	/* Negative dentry - try next */
 	if (!simple_positive(ret)) {
 		spin_unlock(&p->d_lock);
+		lock_set_subclass(&ret->d_lock.dep_map, 0, _RET_IP_);
 		p = ret;
 		goto again;
 	}