sync with kernel header, change doesn't affect userspace.

diff --git a/include/xfs_inode.h b/include/xfs_inode.h
index aab236bef80288412c98a3306f472c803dd9eefd..667a847d6b96bd67f1382f341f26e1287eaf226a 100644 (file)
--- a/include/xfs_inode.h
+++ b/include/xfs_inode.h
@@ -492,6 +492,13 @@ xfs_inode_t *xfs_bhvtoi(struct bhv_desc *bhvp);
  */
 #define XFS_CHASH(mp,blk) ((mp)->m_chash + (((uint)blk) % (mp)->m_chsize))
 
+/*
+ * For multiple groups support: if ISGID bit is set in the parent
+ * directory, group of new file is set to that of the parent, and
+ * new subdirectory gets ISGID bit from parent.
+ */
+#define XFS_INHERIT_GID(pip, vfsp)     ((pip) != NULL && \
+       (((vfsp)->vfs_flag & VFS_GRPID) || ((pip)->i_d.di_mode & ISGID)))
 
 /*
  * xfs_iget.c prototypes.

diff --git a/include/xfs_quota.h b/include/xfs_quota.h
index 2dd83faa74f179a16c8f5402451774c4b65fa8ca..a86651c4ab29a9018a29bfb680d716f85b94bd49 100644 (file)
--- a/include/xfs_quota.h
+++ b/include/xfs_quota.h
@@ -123,6 +123,11 @@ typedef __uint16_t      xfs_qwarncnt_t;
 #define XFS_QMOPT_ASYNC                0x2000000
 #define XFS_QMOPT_DELWRI       0x4000000
 
+/*
+ * flags for dqalloc.
+ */
+#define XFS_QMOPT_INHERIT      0x8000000
+
 /* 
  * flags to xfs_trans_mod_dquot.
  */