Commit 8f7d3b53 authored by Nathan Scott's avatar Nathan Scott Committed by Christoph Hellwig

[XFS] Fix up some minor namespace pollution problems.

SGI Modid: 2.5.x-xfs:slinx:143053a
parent 47da3f50
...@@ -459,6 +459,8 @@ int xfs_bmap_sanity_check(struct xfs_mount *mp, xfs_bmbt_block_t *bb, ...@@ -459,6 +459,8 @@ int xfs_bmap_sanity_check(struct xfs_mount *mp, xfs_bmbt_block_t *bb,
#endif #endif
#ifdef __KERNEL__
/* /*
* Prototypes for xfs_bmap.c to call. * Prototypes for xfs_bmap.c to call.
*/ */
...@@ -706,5 +708,6 @@ xfs_bmap_do_search_extents( ...@@ -706,5 +708,6 @@ xfs_bmap_do_search_extents(
xfs_bmbt_irec_t *, xfs_bmbt_irec_t *,
xfs_bmbt_irec_t *); xfs_bmbt_irec_t *);
#endif /* __KERNEL__ */
#endif /* __XFS_BMAP_BTREE_H__ */ #endif /* __XFS_BMAP_BTREE_H__ */
...@@ -44,21 +44,25 @@ ...@@ -44,21 +44,25 @@
* d_miniosz is the min xfer size, xfer size multiple and file seek offset * d_miniosz is the min xfer size, xfer size multiple and file seek offset
* alignment. * alignment.
*/ */
#ifndef HAVE_DIOATTR
struct dioattr { struct dioattr {
__u32 d_mem; /* data buffer memory alignment */ __u32 d_mem; /* data buffer memory alignment */
__u32 d_miniosz; /* min xfer size */ __u32 d_miniosz; /* min xfer size */
__u32 d_maxiosz; /* max xfer size */ __u32 d_maxiosz; /* max xfer size */
}; };
#endif
/* /*
* Structure for XFS_IOC_FSGETXATTR[A] and XFS_IOC_FSSETXATTR. * Structure for XFS_IOC_FSGETXATTR[A] and XFS_IOC_FSSETXATTR.
*/ */
#ifndef HAVE_FSXATTR
struct fsxattr { struct fsxattr {
__u32 fsx_xflags; /* xflags field value (get/set) */ __u32 fsx_xflags; /* xflags field value (get/set) */
__u32 fsx_extsize; /* extsize field value (get/set)*/ __u32 fsx_extsize; /* extsize field value (get/set)*/
__u32 fsx_nextents; /* nextents field value (get) */ __u32 fsx_nextents; /* nextents field value (get) */
unsigned char fsx_pad[16]; unsigned char fsx_pad[16];
}; };
#endif
/* /*
* Flags for the bs_xflags/fsx_xflags field * Flags for the bs_xflags/fsx_xflags field
...@@ -79,6 +83,7 @@ struct fsxattr { ...@@ -79,6 +83,7 @@ struct fsxattr {
* number of array elements given. The first structure is updated on * number of array elements given. The first structure is updated on
* return to give the offset and length for the next call. * return to give the offset and length for the next call.
*/ */
#ifndef HAVE_GETBMAP
struct getbmap { struct getbmap {
__s64 bmv_offset; /* file offset of segment in blocks */ __s64 bmv_offset; /* file offset of segment in blocks */
__s64 bmv_block; /* starting block (64-bit daddr_t) */ __s64 bmv_block; /* starting block (64-bit daddr_t) */
...@@ -86,6 +91,7 @@ struct getbmap { ...@@ -86,6 +91,7 @@ struct getbmap {
__s32 bmv_count; /* # of entries in array incl. 1st */ __s32 bmv_count; /* # of entries in array incl. 1st */
__s32 bmv_entries; /* # of entries filled in (output) */ __s32 bmv_entries; /* # of entries filled in (output) */
}; };
#endif
/* /*
* Structure for XFS_IOC_GETBMAPX. Fields bmv_offset through bmv_entries * Structure for XFS_IOC_GETBMAPX. Fields bmv_offset through bmv_entries
...@@ -96,6 +102,7 @@ struct getbmap { ...@@ -96,6 +102,7 @@ struct getbmap {
* in by the XFS_IOC_GETBMAPX command for each returned structure after * in by the XFS_IOC_GETBMAPX command for each returned structure after
* the first. * the first.
*/ */
#ifndef HAVE_GETBMAPX
struct getbmapx { struct getbmapx {
__s64 bmv_offset; /* file offset of segment in blocks */ __s64 bmv_offset; /* file offset of segment in blocks */
__s64 bmv_block; /* starting block (64-bit daddr_t) */ __s64 bmv_block; /* starting block (64-bit daddr_t) */
...@@ -107,6 +114,7 @@ struct getbmapx { ...@@ -107,6 +114,7 @@ struct getbmapx {
__s32 bmv_unused1; /* future use */ __s32 bmv_unused1; /* future use */
__s32 bmv_unused2; /* future use */ __s32 bmv_unused2; /* future use */
}; };
#endif
/* bmv_iflags values - set by XFS_IOC_GETBMAPX caller. */ /* bmv_iflags values - set by XFS_IOC_GETBMAPX caller. */
#define BMV_IF_ATTRFORK 0x1 /* return attr fork rather than data */ #define BMV_IF_ATTRFORK 0x1 /* return attr fork rather than data */
...@@ -136,11 +144,13 @@ struct getbmapx { ...@@ -136,11 +144,13 @@ struct getbmapx {
* only values previously obtained via xfs_bulkstat! (Specifically the * only values previously obtained via xfs_bulkstat! (Specifically the
* xfs_bstat_t fields bs_dmevmask and bs_dmstate.) * xfs_bstat_t fields bs_dmevmask and bs_dmstate.)
*/ */
#ifndef HAVE_FSDMIDATA
struct fsdmidata { struct fsdmidata {
__u32 fsd_dmevmask; /* corresponds to di_dmevmask */ __u32 fsd_dmevmask; /* corresponds to di_dmevmask */
__u16 fsd_padding; __u16 fsd_padding;
__u16 fsd_dmstate; /* corresponds to di_dmstate */ __u16 fsd_dmstate; /* corresponds to di_dmstate */
}; };
#endif
/* /*
* File segment locking set data type for 64 bit access. * File segment locking set data type for 64 bit access.
...@@ -391,7 +401,7 @@ typedef struct { ...@@ -391,7 +401,7 @@ typedef struct {
* This is typically called by a stateless file server in order to generate * This is typically called by a stateless file server in order to generate
* "file handles". * "file handles".
*/ */
#ifndef MAXFIDSZ #ifndef HAVE_FID
#define MAXFIDSZ 46 #define MAXFIDSZ 46
typedef struct fid { typedef struct fid {
__u16 fid_len; /* length of data in bytes */ __u16 fid_len; /* length of data in bytes */
...@@ -486,6 +496,7 @@ typedef struct xfs_handle { ...@@ -486,6 +496,7 @@ typedef struct xfs_handle {
/* XFS_IOC_GETFSUUID ---------- deprecated 140 */ /* XFS_IOC_GETFSUUID ---------- deprecated 140 */
#ifndef HAVE_BBMACROS
/* /*
* Block I/O parameterization. A basic block (BB) is the lowest size of * Block I/O parameterization. A basic block (BB) is the lowest size of
* filesystem allocation, and must equal 512. Length units given to bio * filesystem allocation, and must equal 512. Length units given to bio
...@@ -497,5 +508,6 @@ typedef struct xfs_handle { ...@@ -497,5 +508,6 @@ typedef struct xfs_handle {
#define BTOBB(bytes) (((__u64)(bytes) + BBSIZE - 1) >> BBSHIFT) #define BTOBB(bytes) (((__u64)(bytes) + BBSIZE - 1) >> BBSHIFT)
#define BTOBBT(bytes) ((__u64)(bytes) >> BBSHIFT) #define BTOBBT(bytes) ((__u64)(bytes) >> BBSHIFT)
#define BBTOB(bbs) ((bbs) << BBSHIFT) #define BBTOB(bbs) ((bbs) << BBSHIFT)
#endif
#endif /* __XFS_FS_H__ */ #endif /* __XFS_FS_H__ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment