diff options
author | Christoph Hellwig <hch@infradead.org> | 2008-12-09 04:47:32 -0500 |
---|---|---|
committer | Lachlan McIlroy <lachlan@redback.melbourne.sgi.com> | 2008-12-10 21:14:17 -0500 |
commit | 6d73cf133c5477f7038577bfeda603ce9946f8cb (patch) | |
tree | 68426855963fe343ae796fb490518e62a2d1b1be /fs/xfs/xfs_mount.h | |
parent | 2175dd95741bda5f438e4efe388a8c1bb5abf1cc (diff) |
[XFS] resync headers with libxfs
- xfs_sb.h add the XFS_SB_VERSION2_PARENTBIT features2 that has been
around in userspace for some time
- xfs_inode.h: move a few things out of __KERNEL__ that are needed by
userspace
- xfs_mount.h: only include xfs_sync.h under __KERNEL__
- xfs_inode.c: minor whitespace fixup. I accidentaly changes this when
importing this file for use by userspace.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_mount.h')
-rw-r--r-- | fs/xfs/xfs_mount.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h index ae5da88ace20..c1e028467327 100644 --- a/fs/xfs/xfs_mount.h +++ b/fs/xfs/xfs_mount.h | |||
@@ -18,8 +18,6 @@ | |||
18 | #ifndef __XFS_MOUNT_H__ | 18 | #ifndef __XFS_MOUNT_H__ |
19 | #define __XFS_MOUNT_H__ | 19 | #define __XFS_MOUNT_H__ |
20 | 20 | ||
21 | #include "xfs_sync.h" | ||
22 | |||
23 | typedef struct xfs_trans_reservations { | 21 | typedef struct xfs_trans_reservations { |
24 | uint tr_write; /* extent alloc trans */ | 22 | uint tr_write; /* extent alloc trans */ |
25 | uint tr_itruncate; /* truncate trans */ | 23 | uint tr_itruncate; /* truncate trans */ |
@@ -53,6 +51,8 @@ typedef struct xfs_trans_reservations { | |||
53 | 51 | ||
54 | #else /* __KERNEL__ */ | 52 | #else /* __KERNEL__ */ |
55 | 53 | ||
54 | #include "xfs_sync.h" | ||
55 | |||
56 | struct cred; | 56 | struct cred; |
57 | struct log; | 57 | struct log; |
58 | struct xfs_mount_args; | 58 | struct xfs_mount_args; |