diff options
author | Dave Chinner <david@fromorbit.com> | 2010-01-19 18:47:48 -0500 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2010-01-19 18:47:48 -0500 |
commit | a9273ca5c6814f393e18ed66645f817b2b71e9ad (patch) | |
tree | 3714b7de8b233a31ea6995754f80349327738a88 /fs/xfs/xfs_attr_leaf.c | |
parent | b9c48649577dfc4a8c263c106d518effa24ea54b (diff) |
xfs: convert attr to use unsigned names
To be consistent with the directory code, the attr code should use
unsigned names. Convert the names from the vfs at the highest level
to unsigned, and ænsure they are consistenly used as unsigned down
to disk.
Signed-off-by: Dave Chinner <david@fromorbit.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs/xfs/xfs_attr_leaf.c')
-rw-r--r-- | fs/xfs/xfs_attr_leaf.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/fs/xfs/xfs_attr_leaf.c b/fs/xfs/xfs_attr_leaf.c index baf41b5af756..52519a201849 100644 --- a/fs/xfs/xfs_attr_leaf.c +++ b/fs/xfs/xfs_attr_leaf.c | |||
@@ -521,11 +521,11 @@ xfs_attr_shortform_to_leaf(xfs_da_args_t *args) | |||
521 | 521 | ||
522 | sfe = &sf->list[0]; | 522 | sfe = &sf->list[0]; |
523 | for (i = 0; i < sf->hdr.count; i++) { | 523 | for (i = 0; i < sf->hdr.count; i++) { |
524 | nargs.name = (char *)sfe->nameval; | 524 | nargs.name = sfe->nameval; |
525 | nargs.namelen = sfe->namelen; | 525 | nargs.namelen = sfe->namelen; |
526 | nargs.value = (char *)&sfe->nameval[nargs.namelen]; | 526 | nargs.value = &sfe->nameval[nargs.namelen]; |
527 | nargs.valuelen = sfe->valuelen; | 527 | nargs.valuelen = sfe->valuelen; |
528 | nargs.hashval = xfs_da_hashname((char *)sfe->nameval, | 528 | nargs.hashval = xfs_da_hashname(sfe->nameval, |
529 | sfe->namelen); | 529 | sfe->namelen); |
530 | nargs.flags = XFS_ATTR_NSP_ONDISK_TO_ARGS(sfe->flags); | 530 | nargs.flags = XFS_ATTR_NSP_ONDISK_TO_ARGS(sfe->flags); |
531 | error = xfs_attr_leaf_lookup_int(bp, &nargs); /* set a->index */ | 531 | error = xfs_attr_leaf_lookup_int(bp, &nargs); /* set a->index */ |
@@ -612,10 +612,10 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context) | |||
612 | for (i = 0, sfe = &sf->list[0]; i < sf->hdr.count; i++) { | 612 | for (i = 0, sfe = &sf->list[0]; i < sf->hdr.count; i++) { |
613 | error = context->put_listent(context, | 613 | error = context->put_listent(context, |
614 | sfe->flags, | 614 | sfe->flags, |
615 | (char *)sfe->nameval, | 615 | sfe->nameval, |
616 | (int)sfe->namelen, | 616 | (int)sfe->namelen, |
617 | (int)sfe->valuelen, | 617 | (int)sfe->valuelen, |
618 | (char*)&sfe->nameval[sfe->namelen]); | 618 | &sfe->nameval[sfe->namelen]); |
619 | 619 | ||
620 | /* | 620 | /* |
621 | * Either search callback finished early or | 621 | * Either search callback finished early or |
@@ -659,8 +659,8 @@ xfs_attr_shortform_list(xfs_attr_list_context_t *context) | |||
659 | } | 659 | } |
660 | 660 | ||
661 | sbp->entno = i; | 661 | sbp->entno = i; |
662 | sbp->hash = xfs_da_hashname((char *)sfe->nameval, sfe->namelen); | 662 | sbp->hash = xfs_da_hashname(sfe->nameval, sfe->namelen); |
663 | sbp->name = (char *)sfe->nameval; | 663 | sbp->name = sfe->nameval; |
664 | sbp->namelen = sfe->namelen; | 664 | sbp->namelen = sfe->namelen; |
665 | /* These are bytes, and both on-disk, don't endian-flip */ | 665 | /* These are bytes, and both on-disk, don't endian-flip */ |
666 | sbp->valuelen = sfe->valuelen; | 666 | sbp->valuelen = sfe->valuelen; |
@@ -818,9 +818,9 @@ xfs_attr_leaf_to_shortform(xfs_dabuf_t *bp, xfs_da_args_t *args, int forkoff) | |||
818 | continue; | 818 | continue; |
819 | ASSERT(entry->flags & XFS_ATTR_LOCAL); | 819 | ASSERT(entry->flags & XFS_ATTR_LOCAL); |
820 | name_loc = xfs_attr_leaf_name_local(leaf, i); | 820 | name_loc = xfs_attr_leaf_name_local(leaf, i); |
821 | nargs.name = (char *)name_loc->nameval; | 821 | nargs.name = name_loc->nameval; |
822 | nargs.namelen = name_loc->namelen; | 822 | nargs.namelen = name_loc->namelen; |
823 | nargs.value = (char *)&name_loc->nameval[nargs.namelen]; | 823 | nargs.value = &name_loc->nameval[nargs.namelen]; |
824 | nargs.valuelen = be16_to_cpu(name_loc->valuelen); | 824 | nargs.valuelen = be16_to_cpu(name_loc->valuelen); |
825 | nargs.hashval = be32_to_cpu(entry->hashval); | 825 | nargs.hashval = be32_to_cpu(entry->hashval); |
826 | nargs.flags = XFS_ATTR_NSP_ONDISK_TO_ARGS(entry->flags); | 826 | nargs.flags = XFS_ATTR_NSP_ONDISK_TO_ARGS(entry->flags); |
@@ -2370,10 +2370,10 @@ xfs_attr_leaf_list_int(xfs_dabuf_t *bp, xfs_attr_list_context_t *context) | |||
2370 | 2370 | ||
2371 | retval = context->put_listent(context, | 2371 | retval = context->put_listent(context, |
2372 | entry->flags, | 2372 | entry->flags, |
2373 | (char *)name_loc->nameval, | 2373 | name_loc->nameval, |
2374 | (int)name_loc->namelen, | 2374 | (int)name_loc->namelen, |
2375 | be16_to_cpu(name_loc->valuelen), | 2375 | be16_to_cpu(name_loc->valuelen), |
2376 | (char *)&name_loc->nameval[name_loc->namelen]); | 2376 | &name_loc->nameval[name_loc->namelen]); |
2377 | if (retval) | 2377 | if (retval) |
2378 | return retval; | 2378 | return retval; |
2379 | } else { | 2379 | } else { |
@@ -2397,15 +2397,15 @@ xfs_attr_leaf_list_int(xfs_dabuf_t *bp, xfs_attr_list_context_t *context) | |||
2397 | return retval; | 2397 | return retval; |
2398 | retval = context->put_listent(context, | 2398 | retval = context->put_listent(context, |
2399 | entry->flags, | 2399 | entry->flags, |
2400 | (char *)name_rmt->name, | 2400 | name_rmt->name, |
2401 | (int)name_rmt->namelen, | 2401 | (int)name_rmt->namelen, |
2402 | valuelen, | 2402 | valuelen, |
2403 | (char*)args.value); | 2403 | args.value); |
2404 | kmem_free(args.value); | 2404 | kmem_free(args.value); |
2405 | } else { | 2405 | } else { |
2406 | retval = context->put_listent(context, | 2406 | retval = context->put_listent(context, |
2407 | entry->flags, | 2407 | entry->flags, |
2408 | (char *)name_rmt->name, | 2408 | name_rmt->name, |
2409 | (int)name_rmt->namelen, | 2409 | (int)name_rmt->namelen, |
2410 | valuelen, | 2410 | valuelen, |
2411 | NULL); | 2411 | NULL); |