Commit 1b767ee3 authored by Dave Chinner's avatar Dave Chinner Committed by Dave Chinner
Browse files

xfs: move ftype conversion functions to libxfs 



These functions are needed in userspace for repair and mkfs to
do the right thing. Move them to libxfs so they can be easily
shared.

Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 2d3d0c53

fs/xfs/libxfs/xfs_dir2.c

+16 −0
Original line number Diff line number Diff line
@@ -38,6 +38,22 @@ 


struct xfs_name xfs_name_dotdot = { (unsigned char *)"..", 2, XFS_DIR3_FT_DIR };



/*

 * @mode, if set, indicates that the type field needs to be set up.

 * This uses the transformation from file mode to DT_* as defined in linux/fs.h

 * for file type specification. This will be propagated into the directory

 * structure if appropriate for the given operation and filesystem config.

 */

const unsigned char xfs_mode_to_ftype[S_IFMT >> S_SHIFT] = {

	[0]			= XFS_DIR3_FT_UNKNOWN,

	[S_IFREG >> S_SHIFT]    = XFS_DIR3_FT_REG_FILE,

	[S_IFDIR >> S_SHIFT]    = XFS_DIR3_FT_DIR,

	[S_IFCHR >> S_SHIFT]    = XFS_DIR3_FT_CHRDEV,

	[S_IFBLK >> S_SHIFT]    = XFS_DIR3_FT_BLKDEV,

	[S_IFIFO >> S_SHIFT]    = XFS_DIR3_FT_FIFO,

	[S_IFSOCK >> S_SHIFT]   = XFS_DIR3_FT_SOCK,

	[S_IFLNK >> S_SHIFT]    = XFS_DIR3_FT_SYMLINK,

};



/*

 * ASCII case-insensitive (ie. A-Z) support for directories that was

fs/xfs/libxfs/xfs_dir2.h

+6 −0
Original line number Diff line number Diff line
@@ -31,6 +31,12 @@ struct xfs_dir2_data_unused; 


extern struct xfs_name	xfs_name_dotdot;



/*

 * directory filetype conversion tables.

 */

#define S_SHIFT 12

extern const unsigned char xfs_mode_to_ftype[];



/*

 * directory operations vector for encode/decode routines

 */

fs/xfs/libxfs/xfs_dir2_priv.h

+0 −6
Original line number Diff line number Diff line
@@ -161,12 +161,6 @@ extern int xfs_dir2_grow_inode(struct xfs_da_args *args, int space, 
extern int xfs_dir_cilookup_result(struct xfs_da_args *args,

				const unsigned char *name, int len);



#define S_SHIFT 12

extern const unsigned char xfs_mode_to_ftype[];



extern unsigned char xfs_dir3_get_dtype(struct xfs_mount *mp,

					__uint8_t filetype);





/* xfs_dir2_block.c */

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

fs/xfs/xfs_dir2_readdir.c

+1 −17
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static unsigned char xfs_dir3_filetype_table[] = { 
	DT_FIFO, DT_SOCK, DT_LNK, DT_WHT,

};



unsigned char

static unsigned char

xfs_dir3_get_dtype(

	struct xfs_mount	*mp,

	__uint8_t		filetype)
@@ -57,22 +57,6 @@ xfs_dir3_get_dtype( 


	return xfs_dir3_filetype_table[filetype];

}

/*

 * @mode, if set, indicates that the type field needs to be set up.

 * This uses the transformation from file mode to DT_* as defined in linux/fs.h

 * for file type specification. This will be propagated into the directory

 * structure if appropriate for the given operation and filesystem config.

 */

const unsigned char xfs_mode_to_ftype[S_IFMT >> S_SHIFT] = {

	[0]			= XFS_DIR3_FT_UNKNOWN,

	[S_IFREG >> S_SHIFT]    = XFS_DIR3_FT_REG_FILE,

	[S_IFDIR >> S_SHIFT]    = XFS_DIR3_FT_DIR,

	[S_IFCHR >> S_SHIFT]    = XFS_DIR3_FT_CHRDEV,

	[S_IFBLK >> S_SHIFT]    = XFS_DIR3_FT_BLKDEV,

	[S_IFIFO >> S_SHIFT]    = XFS_DIR3_FT_FIFO,

	[S_IFSOCK >> S_SHIFT]   = XFS_DIR3_FT_SOCK,

	[S_IFLNK >> S_SHIFT]    = XFS_DIR3_FT_SYMLINK,

};



STATIC int

xfs_dir2_sf_getdents(

fs/xfs/xfs_iops.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include "xfs_icache.h"

#include "xfs_symlink.h"

#include "xfs_da_btree.h"

#include "xfs_dir2_priv.h"

#include "xfs_dir2.h"

#include "xfs_dinode.h"

#include "xfs_trans_space.h"