Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 181800
b: refs/heads/master
c: 4a24cb7
h: refs/heads/master
v: v3
  • Loading branch information
Dave Chinner committed Jan 19, 2010
1 parent 4be8b75 commit 8829a7e
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a9273ca5c6814f393e18ed66645f817b2b71e9ad
refs/heads/master: 4a24cb71407dc25035d75dd3d118e0e55679e217
2 changes: 1 addition & 1 deletion trunk/fs/xfs/xfs_dir2.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#include "xfs_vnodeops.h"
#include "xfs_trace.h"

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

/*
* ASCII case-insensitive (ie. A-Z) support for directories that was
Expand Down
9 changes: 5 additions & 4 deletions trunk/fs/xfs/xfs_dir2_block.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ static xfs_dahash_t xfs_dir_hash_dot, xfs_dir_hash_dotdot;
void
xfs_dir_startup(void)
{
xfs_dir_hash_dot = xfs_da_hashname(".", 1);
xfs_dir_hash_dotdot = xfs_da_hashname("..", 2);
xfs_dir_hash_dot = xfs_da_hashname((unsigned char *)".", 1);
xfs_dir_hash_dotdot = xfs_da_hashname((unsigned char *)"..", 2);
}

/*
Expand Down Expand Up @@ -513,8 +513,9 @@ xfs_dir2_block_getdents(
/*
* If it didn't fit, set the final offset to here & return.
*/
if (filldir(dirent, dep->name, dep->namelen, cook & 0x7fffffff,
be64_to_cpu(dep->inumber), DT_UNKNOWN)) {
if (filldir(dirent, (char *)dep->name, dep->namelen,
cook & 0x7fffffff, be64_to_cpu(dep->inumber),
DT_UNKNOWN)) {
*offset = cook & 0x7fffffff;
xfs_da_brelse(NULL, bp);
return 0;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/xfs/xfs_dir2_leaf.c
Original file line number Diff line number Diff line change
Expand Up @@ -1081,7 +1081,7 @@ xfs_dir2_leaf_getdents(
dep = (xfs_dir2_data_entry_t *)ptr;
length = xfs_dir2_data_entsize(dep->namelen);

if (filldir(dirent, dep->name, dep->namelen,
if (filldir(dirent, (char *)dep->name, dep->namelen,
xfs_dir2_byte_to_dataptr(mp, curoff) & 0x7fffffff,
be64_to_cpu(dep->inumber), DT_UNKNOWN))
break;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/xfs/xfs_dir2_sf.c
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,7 @@ xfs_dir2_sf_getdents(
}

ino = xfs_dir2_sf_get_inumber(sfp, xfs_dir2_sf_inumberp(sfep));
if (filldir(dirent, sfep->name, sfep->namelen,
if (filldir(dirent, (char *)sfep->name, sfep->namelen,
off & 0x7fffffff, ino, DT_UNKNOWN)) {
*offset = off & 0x7fffffff;
return 0;
Expand Down

0 comments on commit 8829a7e

Please sign in to comment.