Merge branch 'master' into gfs2

[linux-flexiantxendom0-3.2.10.git] / include / linux / fs.h

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 83abd9d..4e93bf9 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -570,13 +570,14 @@ struct inode {
  * 3: quota file
  *
  * The locking order between these classes is
- * parent -> child -> normal -> quota
+ * parent -> child -> normal -> xattr -> quota
  */
 enum inode_i_mutex_lock_class
 {
        I_MUTEX_NORMAL,
        I_MUTEX_PARENT,
        I_MUTEX_CHILD,
+       I_MUTEX_XATTR,
        I_MUTEX_QUOTA
 };