[PATCH 3/7] xfs: add a separate lock class for the per-mount list of dquots

Christoph Hellwig
2009-01-09T22:13:03Z

[-- Attachment #1: xfs-fix-xfs_qm_dqusage_adjust-lockdep-warning --]
[-- Type: text/plain, Size: 1250 bytes --]

We can have both a a quota hash chain and the per-mount list locked at
the same time. But given that both use the same struct dqhash as list
head we have to tell lockdep that they are different lock classes.

Signed-off-by: Christoph Hellwig <hch@lst.de>

Index: xfs/fs/xfs/quota/xfs_qm.c
===================================================================
--- xfs.orig/fs/xfs/quota/xfs_qm.c 2008-12-29 01:27:21.000000000 +0000
+++ xfs/fs/xfs/quota/xfs_qm.c 2008-12-29 01:34:48.000000000 +0000
@@ -1068,6 +1068,13 @@
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
@@ -1103,6 +1110,8 @@
}

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 */