diff options
author | Dave Chinner <david@fromorbit.com> | 2010-01-19 18:48:05 -0500 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2010-01-19 18:48:05 -0500 |
commit | 4a24cb71407dc25035d75dd3d118e0e55679e217 (patch) | |
tree | 47de3e791d35786e0b797b8033afe5f4320b08e3 | |
parent | a9273ca5c6814f393e18ed66645f817b2b71e9ad (diff) |
xfs: clean up sign warnings in dir2 code
We are now consistently using unsigned char strings for names
so fix up the remaining warnings in the dir2 code to complete
the cleanup.
Signed-off-by: Dave Chinner <david@fromorbit.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
-rw-r--r-- | fs/xfs/xfs_dir2.c | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_dir2_block.c | 9 | ||||
-rw-r--r-- | fs/xfs/xfs_dir2_leaf.c | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_dir2_sf.c | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/fs/xfs/xfs_dir2.c b/fs/xfs/xfs_dir2.c index 3a8c6ba0638f..42520f041265 100644 --- a/fs/xfs/xfs_dir2.c +++ b/fs/xfs/xfs_dir2.c | |||
@@ -44,7 +44,7 @@ | |||
44 | #include "xfs_vnodeops.h" | 44 | #include "xfs_vnodeops.h" |
45 | #include "xfs_trace.h" | 45 | #include "xfs_trace.h" |
46 | 46 | ||
47 | struct xfs_name xfs_name_dotdot = {"..", 2}; | 47 | struct xfs_name xfs_name_dotdot = { (unsigned char *)"..", 2}; |
48 | 48 | ||
49 | /* | 49 | /* |
50 | * ASCII case-insensitive (ie. A-Z) support for directories that was | 50 | * ASCII case-insensitive (ie. A-Z) support for directories that was |
diff --git a/fs/xfs/xfs_dir2_block.c b/fs/xfs/xfs_dir2_block.c index ddc4ecc7807f..779a267b0a84 100644 --- a/fs/xfs/xfs_dir2_block.c +++ b/fs/xfs/xfs_dir2_block.c | |||
@@ -57,8 +57,8 @@ static xfs_dahash_t xfs_dir_hash_dot, xfs_dir_hash_dotdot; | |||
57 | void | 57 | void |
58 | xfs_dir_startup(void) | 58 | xfs_dir_startup(void) |
59 | { | 59 | { |
60 | xfs_dir_hash_dot = xfs_da_hashname(".", 1); | 60 | xfs_dir_hash_dot = xfs_da_hashname((unsigned char *)".", 1); |
61 | xfs_dir_hash_dotdot = xfs_da_hashname("..", 2); | 61 | xfs_dir_hash_dotdot = xfs_da_hashname((unsigned char *)"..", 2); |
62 | } | 62 | } |
63 | 63 | ||
64 | /* | 64 | /* |
@@ -513,8 +513,9 @@ xfs_dir2_block_getdents( | |||
513 | /* | 513 | /* |
514 | * If it didn't fit, set the final offset to here & return. | 514 | * If it didn't fit, set the final offset to here & return. |
515 | */ | 515 | */ |
516 | if (filldir(dirent, dep->name, dep->namelen, cook & 0x7fffffff, | 516 | if (filldir(dirent, (char *)dep->name, dep->namelen, |
517 | be64_to_cpu(dep->inumber), DT_UNKNOWN)) { | 517 | cook & 0x7fffffff, be64_to_cpu(dep->inumber), |
518 | DT_UNKNOWN)) { | ||
518 | *offset = cook & 0x7fffffff; | 519 | *offset = cook & 0x7fffffff; |
519 | xfs_da_brelse(NULL, bp); | 520 | xfs_da_brelse(NULL, bp); |
520 | return 0; | 521 | return 0; |
diff --git a/fs/xfs/xfs_dir2_leaf.c b/fs/xfs/xfs_dir2_leaf.c index 29f484c11b3a..e2d89854ec9e 100644 --- a/fs/xfs/xfs_dir2_leaf.c +++ b/fs/xfs/xfs_dir2_leaf.c | |||
@@ -1081,7 +1081,7 @@ xfs_dir2_leaf_getdents( | |||
1081 | dep = (xfs_dir2_data_entry_t *)ptr; | 1081 | dep = (xfs_dir2_data_entry_t *)ptr; |
1082 | length = xfs_dir2_data_entsize(dep->namelen); | 1082 | length = xfs_dir2_data_entsize(dep->namelen); |
1083 | 1083 | ||
1084 | if (filldir(dirent, dep->name, dep->namelen, | 1084 | if (filldir(dirent, (char *)dep->name, dep->namelen, |
1085 | xfs_dir2_byte_to_dataptr(mp, curoff) & 0x7fffffff, | 1085 | xfs_dir2_byte_to_dataptr(mp, curoff) & 0x7fffffff, |
1086 | be64_to_cpu(dep->inumber), DT_UNKNOWN)) | 1086 | be64_to_cpu(dep->inumber), DT_UNKNOWN)) |
1087 | break; | 1087 | break; |
diff --git a/fs/xfs/xfs_dir2_sf.c b/fs/xfs/xfs_dir2_sf.c index 9d4f17a69676..c1a5945d463a 100644 --- a/fs/xfs/xfs_dir2_sf.c +++ b/fs/xfs/xfs_dir2_sf.c | |||
@@ -782,7 +782,7 @@ xfs_dir2_sf_getdents( | |||
782 | } | 782 | } |
783 | 783 | ||
784 | ino = xfs_dir2_sf_get_inumber(sfp, xfs_dir2_sf_inumberp(sfep)); | 784 | ino = xfs_dir2_sf_get_inumber(sfp, xfs_dir2_sf_inumberp(sfep)); |
785 | if (filldir(dirent, sfep->name, sfep->namelen, | 785 | if (filldir(dirent, (char *)sfep->name, sfep->namelen, |
786 | off & 0x7fffffff, ino, DT_UNKNOWN)) { | 786 | off & 0x7fffffff, ino, DT_UNKNOWN)) { |
787 | *offset = off & 0x7fffffff; | 787 | *offset = off & 0x7fffffff; |
788 | return 0; | 788 | return 0; |