فهرست منبع

xfs: convert dirnameops to unsigned char names

To be consistent across the codebase, convert the dirnameops to pass
the directory names by unsigned char strings.

Signed-off-by: Dave Chinner <david@fromorbit.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Dave Chinner 15 سال پیش
والد
کامیت
2bc754213d
3فایلهای تغییر یافته به همراه7 افزوده شده و 6 حذف شده
  1. 2 2
      fs/xfs/xfs_da_btree.c
  2. 3 2
      fs/xfs/xfs_da_btree.h
  3. 2 2
      fs/xfs/xfs_dir2.c

+ 2 - 2
fs/xfs/xfs_da_btree.c

@@ -1534,8 +1534,8 @@ xfs_da_hashname(const __uint8_t *name, int namelen)
 enum xfs_dacmp
 enum xfs_dacmp
 xfs_da_compname(
 xfs_da_compname(
 	struct xfs_da_args *args,
 	struct xfs_da_args *args,
-	const char 	*name,
-	int 		len)
+	const unsigned char *name,
+	int		len)
 {
 {
 	return (args->namelen == len && memcmp(args->name, name, len) == 0) ?
 	return (args->namelen == len && memcmp(args->name, name, len) == 0) ?
 					XFS_CMP_EXACT : XFS_CMP_DIFFERENT;
 					XFS_CMP_EXACT : XFS_CMP_DIFFERENT;

+ 3 - 2
fs/xfs/xfs_da_btree.h

@@ -209,7 +209,8 @@ typedef struct xfs_da_state {
  */
  */
 struct xfs_nameops {
 struct xfs_nameops {
 	xfs_dahash_t	(*hashname)(struct xfs_name *);
 	xfs_dahash_t	(*hashname)(struct xfs_name *);
-	enum xfs_dacmp	(*compname)(struct xfs_da_args *, const char *, int);
+	enum xfs_dacmp	(*compname)(struct xfs_da_args *,
+					const unsigned char *, int);
 };
 };
 
 
 
 
@@ -260,7 +261,7 @@ int	xfs_da_shrink_inode(xfs_da_args_t *args, xfs_dablk_t dead_blkno,
 
 
 uint xfs_da_hashname(const __uint8_t *name_string, int name_length);
 uint xfs_da_hashname(const __uint8_t *name_string, int name_length);
 enum xfs_dacmp xfs_da_compname(struct xfs_da_args *args,
 enum xfs_dacmp xfs_da_compname(struct xfs_da_args *args,
-				const char *name, int len);
+				const unsigned char *name, int len);
 
 
 
 
 xfs_da_state_t *xfs_da_state_alloc(void);
 xfs_da_state_t *xfs_da_state_alloc(void);

+ 2 - 2
fs/xfs/xfs_dir2.c

@@ -66,8 +66,8 @@ xfs_ascii_ci_hashname(
 STATIC enum xfs_dacmp
 STATIC enum xfs_dacmp
 xfs_ascii_ci_compname(
 xfs_ascii_ci_compname(
 	struct xfs_da_args *args,
 	struct xfs_da_args *args,
-	const char	*name,
-	int 		len)
+	const unsigned char *name,
+	int		len)
 {
 {
 	enum xfs_dacmp	result;
 	enum xfs_dacmp	result;
 	int		i;
 	int		i;