---

yaml
---
r: 140065
b: refs/heads/master
c: a4edd1d
h: refs/heads/master
i:
  140063: 404a253
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 178eae342b34185ef7b11e62df2f74ba45daa56e
+refs/heads/master: a4edd1da20af79b2e92efeee3ca94831c8024d61

trunk/fs/xfs/quota/xfs_qm.c

@@ -1070,6 +1070,13 @@ xfs_qm_sync(
 	return 0;
 }
 
+/*
+ * The hash chains and the mplist use the same xfs_dqhash structure as
+ * their list head, but we can take the mplist qh_lock and one of the
+ * hash qh_locks at the same time without any problem as they aren't
+ * related.
+ */
+static struct lock_class_key xfs_quota_mplist_class;
 
 /*
  * This initializes all the quota information that's kept in the
@@ -1105,6 +1112,8 @@ xfs_qm_init_quotainfo(
 	}
 
 	xfs_qm_list_init(&qinf->qi_dqlist, "mpdqlist", 0);
+	lockdep_set_class(&qinf->qi_dqlist.qh_lock, &xfs_quota_mplist_class);
+
 	qinf->qi_dqreclaims = 0;
 
 	/* mutex used to serialize quotaoffs */