Trivial sync ups with kernel header changes.

diff --git a/include/xfs_acl.h b/include/xfs_acl.h
index c6fd578694a553bce2ebdb4b61729eef81b01013..dda3fb5f823fdf16b6d62f6f4a27cca9cac42e10 100644 (file)
--- a/include/xfs_acl.h
+++ b/include/xfs_acl.h
@@ -63,7 +63,7 @@ typedef struct xfs_acl {
 
 #ifdef __KERNEL__
 
-#ifdef CONFIG_FS_POSIX_ACL
+#ifdef CONFIG_XFS_POSIX_ACL
 
 struct vattr;
 struct vnode;

diff --git a/include/xfs_dir2.h b/include/xfs_dir2.h
index b4037885753687e0d2cfb1befd53671f7e6fcf4d..c129b70141468c7af602ee5a000d76908abc9ee7 100644 (file)
--- a/include/xfs_dir2.h
+++ b/include/xfs_dir2.h
@@ -32,7 +32,6 @@
 #ifndef __XFS_DIR2_H__
 #define __XFS_DIR2_H__
 
-struct dirent;
 struct uio;
 struct xfs_dabuf;
 struct xfs_da_args;

diff --git a/include/xfs_dir2_block.h b/include/xfs_dir2_block.h
index 16fdf22bf17dc552abf5e0839df3d9e3ac42afef..64b9d06e4b21e3bb914d76149df5a00d5f76d220 100644 (file)
--- a/include/xfs_dir2_block.h
+++ b/include/xfs_dir2_block.h
@@ -37,7 +37,6 @@
  * Directory version 2, single block format structures
  */
 
-struct dirent;
 struct uio;
 struct xfs_dabuf;
 struct xfs_da_args;

diff --git a/include/xfs_dir2_leaf.h b/include/xfs_dir2_leaf.h
index 778645e173d26b00bb1ce6f00754f1fc38677e03..35549d9675a2342e3526de022aa2fd608fd0ea1b 100644 (file)
--- a/include/xfs_dir2_leaf.h
+++ b/include/xfs_dir2_leaf.h
@@ -36,7 +36,6 @@
  * Directory version 2, leaf block structures.
  */
 
-struct dirent;
 struct uio;
 struct xfs_dabuf;
 struct xfs_da_args;

diff --git a/include/xfs_dir2_node.h b/include/xfs_dir2_node.h
index 7afa4ed4f071136d73fd2198fa431a980072b259..af63d6a05ae68740ee0d0a82633bbd53ac53502d 100644 (file)
--- a/include/xfs_dir2_node.h
+++ b/include/xfs_dir2_node.h
@@ -36,7 +36,6 @@
  * Directory version 2, btree node format structures
  */
 
-struct dirent;
 struct uio;
 struct xfs_dabuf;
 struct xfs_da_args;

diff --git a/include/xfs_dir2_sf.h b/include/xfs_dir2_sf.h
index 7ee59c6107b39e900845d6d8e9fbda84ebf03eff..4a9ef05678cc042fdec3361bd4f52f8172be1cb8 100644 (file)
--- a/include/xfs_dir2_sf.h
+++ b/include/xfs_dir2_sf.h
@@ -39,7 +39,6 @@
  * fit into the literal area of the inode.
  */
 
-struct dirent;
 struct uio;
 struct xfs_dabuf;
 struct xfs_da_args;

diff --git a/include/xfs_dir_leaf.h b/include/xfs_dir_leaf.h
index d81eebdcc0a540a3ab744b4eac72a73b259587a1..ddcc9e065940033e5de2d513bbdf196863a0c6ff 100644 (file)
--- a/include/xfs_dir_leaf.h
+++ b/include/xfs_dir_leaf.h
@@ -42,7 +42,6 @@
  * internal links in the Btree are logical block offsets into the file.
  */
 
-struct dirent;
 struct uio;
 struct xfs_bmap_free;
 struct xfs_dabuf;