diff options
author | Dave Chinner <david@fromorbit.com> | 2010-01-19 18:47:17 -0500 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2010-01-19 18:47:17 -0500 |
commit | 2bc754213d40d67c39ddd58cf240f2b948e1951e (patch) | |
tree | cbb289ab5f17d3d65dfca5df5fbe65066d90c1ee | |
parent | 046ea753130fc51d885835458bf8c1d84765b9ac (diff) |
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>
-rw-r--r-- | fs/xfs/xfs_da_btree.c | 4 | ||||
-rw-r--r-- | fs/xfs/xfs_da_btree.h | 5 | ||||
-rw-r--r-- | fs/xfs/xfs_dir2.c | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/fs/xfs/xfs_da_btree.c b/fs/xfs/xfs_da_btree.c index c0c8869115b1..0ca556b4bf31 100644 --- a/fs/xfs/xfs_da_btree.c +++ b/fs/xfs/xfs_da_btree.c | |||
@@ -1534,8 +1534,8 @@ xfs_da_hashname(const __uint8_t *name, int namelen) | |||
1534 | enum xfs_dacmp | 1534 | enum xfs_dacmp |
1535 | xfs_da_compname( | 1535 | xfs_da_compname( |
1536 | struct xfs_da_args *args, | 1536 | struct xfs_da_args *args, |
1537 | const char *name, | 1537 | const unsigned char *name, |
1538 | int len) | 1538 | int len) |
1539 | { | 1539 | { |
1540 | return (args->namelen == len && memcmp(args->name, name, len) == 0) ? | 1540 | return (args->namelen == len && memcmp(args->name, name, len) == 0) ? |
1541 | XFS_CMP_EXACT : XFS_CMP_DIFFERENT; | 1541 | XFS_CMP_EXACT : XFS_CMP_DIFFERENT; |
diff --git a/fs/xfs/xfs_da_btree.h b/fs/xfs/xfs_da_btree.h index 30cd08f56a3a..fe9f5a8c1d2a 100644 --- a/fs/xfs/xfs_da_btree.h +++ b/fs/xfs/xfs_da_btree.h | |||
@@ -209,7 +209,8 @@ typedef struct xfs_da_state { | |||
209 | */ | 209 | */ |
210 | struct xfs_nameops { | 210 | struct xfs_nameops { |
211 | xfs_dahash_t (*hashname)(struct xfs_name *); | 211 | xfs_dahash_t (*hashname)(struct xfs_name *); |
212 | enum xfs_dacmp (*compname)(struct xfs_da_args *, const char *, int); | 212 | enum xfs_dacmp (*compname)(struct xfs_da_args *, |
213 | const unsigned char *, int); | ||
213 | }; | 214 | }; |
214 | 215 | ||
215 | 216 | ||
@@ -260,7 +261,7 @@ int xfs_da_shrink_inode(xfs_da_args_t *args, xfs_dablk_t dead_blkno, | |||
260 | 261 | ||
261 | uint xfs_da_hashname(const __uint8_t *name_string, int name_length); | 262 | uint xfs_da_hashname(const __uint8_t *name_string, int name_length); |
262 | enum xfs_dacmp xfs_da_compname(struct xfs_da_args *args, | 263 | enum xfs_dacmp xfs_da_compname(struct xfs_da_args *args, |
263 | const char *name, int len); | 264 | const unsigned char *name, int len); |
264 | 265 | ||
265 | 266 | ||
266 | xfs_da_state_t *xfs_da_state_alloc(void); | 267 | xfs_da_state_t *xfs_da_state_alloc(void); |
diff --git a/fs/xfs/xfs_dir2.c b/fs/xfs/xfs_dir2.c index 93634a7e90e9..c21c527766bf 100644 --- a/fs/xfs/xfs_dir2.c +++ b/fs/xfs/xfs_dir2.c | |||
@@ -66,8 +66,8 @@ xfs_ascii_ci_hashname( | |||
66 | STATIC enum xfs_dacmp | 66 | STATIC enum xfs_dacmp |
67 | xfs_ascii_ci_compname( | 67 | xfs_ascii_ci_compname( |
68 | struct xfs_da_args *args, | 68 | struct xfs_da_args *args, |
69 | const char *name, | 69 | const unsigned char *name, |
70 | int len) | 70 | int len) |
71 | { | 71 | { |
72 | enum xfs_dacmp result; | 72 | enum xfs_dacmp result; |
73 | int i; | 73 | int i; |