Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d0f864b authored by Nathan Scott's avatar Nathan Scott
Browse files

[XFS] Make headers compile for more compiler variants; minor cleanup. 



SGI-PV: 949432
SGI-Modid: xfs-linux-melb:xfs-kern:25184a

Signed-off-by: default avatarNathan Scott <nathans@sgi.com>
parent d2c32edf

fs/xfs/xfs_dir2.h

+11 −16
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ typedef int (*xfs_dir2_put_t)(struct xfs_dir2_put_args *pa); 
typedef struct xfs_dir2_put_args {

	xfs_off_t	cook;		/* cookie of (next) entry */

	xfs_intino_t	ino;		/* inode number */

	struct xfs_dirent	*dbp;		/* buffer pointer */

	xfs_dirent_t	*dbp;		/* buffer pointer */

	char		*name;		/* directory entry name */

	int		namelen;	/* length of name */

	int		done;		/* output: set if value was stored */
@@ -75,18 +75,13 @@ typedef struct xfs_dir2_put_args { 
/*

 * Other interfaces used by the rest of the dir v2 code.

 */

extern int

	xfs_dir2_grow_inode(struct xfs_da_args *args, int space,

extern int xfs_dir2_grow_inode(struct xfs_da_args *args, int space,

				xfs_dir2_db_t *dbp);



extern int

	xfs_dir2_isblock(struct xfs_trans *tp, struct xfs_inode *dp, int *vp);



extern int

	xfs_dir2_isleaf(struct xfs_trans *tp, struct xfs_inode *dp, int *vp);



extern int

	xfs_dir2_shrink_inode(struct xfs_da_args *args, xfs_dir2_db_t db,

extern int xfs_dir2_isblock(struct xfs_trans *tp, struct xfs_inode *dp,

				int *vp);

extern int xfs_dir2_isleaf(struct xfs_trans *tp, struct xfs_inode *dp,

				int *vp);

extern int xfs_dir2_shrink_inode(struct xfs_da_args *args, xfs_dir2_db_t db,

				struct xfs_dabuf *bp);



#endif	/* __XFS_DIR2_H__ */

fs/xfs/xfs_dir_sf.h

+13 −11
Original line number Diff line number Diff line
@@ -35,19 +35,21 @@ typedef struct { __uint8_t i[sizeof(xfs_ino_t)]; } xfs_dir_ino_t; 
 * and the elements much be memcpy'd out into a work area to get correct

 * alignment for the inode number fields.

 */

typedef struct xfs_dir_shortform {

	struct xfs_dir_sf_hdr {		/* constant-structure header block */

typedef struct xfs_dir_sf_hdr {		/* constant-structure header block */

	xfs_dir_ino_t	parent;		/* parent dir inode number */

	__uint8_t	count;		/* count of active entries */

	} hdr;

	struct xfs_dir_sf_entry {

} xfs_dir_sf_hdr_t;



typedef struct xfs_dir_sf_entry {

	xfs_dir_ino_t	inumber;	/* referenced inode number */

	__uint8_t	namelen;	/* actual length of name (no NULL) */

	__uint8_t	name[1];	/* name */

	} list[1];			/* variable sized array */

} xfs_dir_sf_entry_t;



typedef struct xfs_dir_shortform {

	xfs_dir_sf_hdr_t	hdr;

	xfs_dir_sf_entry_t	list[1];	/* variable sized array */

} xfs_dir_shortform_t;

typedef struct xfs_dir_sf_hdr xfs_dir_sf_hdr_t;

typedef struct xfs_dir_sf_entry xfs_dir_sf_entry_t;



/*

 * We generate this then sort it, so that readdirs are returned in