merge up with user space

diff --git a/include/xfs_types.h b/include/xfs_types.h
index ae9c32356b2906b22f1073ede1b5cd20ad3928cb..309c5781c7412f73f6f7851324f340f290f90392 100644 (file)
--- a/include/xfs_types.h
+++ b/include/xfs_types.h
@@ -287,17 +287,6 @@ typedef __uint64_t __psunsigned_t;
 #error BITS_PER_LONG must be 32 or 64
 #endif
 
-
-/*
- * struct for passing owner/requestor id
- */
-typedef struct flid {
-#ifdef CELL_CAPABLE
-        pid_t   fl_pid;
-        sysid_t fl_sysid;
-#endif
-} flid_t;
-
 #endif /* __KERNEL__ */
 
 #endif /* !__XFS_TYPES_H */