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.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.c')
-rw-r--r-- | fs/xfs/xfs_attr.c | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/fs/xfs/xfs_attr.c b/fs/xfs/xfs_attr.c index 9d11ebad43b6..f7b426a1b6ee 100644 --- a/fs/xfs/xfs_attr.c +++ b/fs/xfs/xfs_attr.c | |||
@@ -93,12 +93,12 @@ STATIC int xfs_attr_rmtval_remove(xfs_da_args_t *args); | |||
93 | STATIC int | 93 | STATIC int |
94 | xfs_attr_name_to_xname( | 94 | xfs_attr_name_to_xname( |
95 | struct xfs_name *xname, | 95 | struct xfs_name *xname, |
96 | const char *aname) | 96 | const unsigned char *aname) |
97 | { | 97 | { |
98 | if (!aname) | 98 | if (!aname) |
99 | return EINVAL; | 99 | return EINVAL; |
100 | xname->name = aname; | 100 | xname->name = aname; |
101 | xname->len = strlen(aname); | 101 | xname->len = strlen((char *)aname); |
102 | if (xname->len >= MAXNAMELEN) | 102 | if (xname->len >= MAXNAMELEN) |
103 | return EFAULT; /* match IRIX behaviour */ | 103 | return EFAULT; /* match IRIX behaviour */ |
104 | 104 | ||
@@ -124,7 +124,7 @@ STATIC int | |||
124 | xfs_attr_get_int( | 124 | xfs_attr_get_int( |
125 | struct xfs_inode *ip, | 125 | struct xfs_inode *ip, |
126 | struct xfs_name *name, | 126 | struct xfs_name *name, |
127 | char *value, | 127 | unsigned char *value, |
128 | int *valuelenp, | 128 | int *valuelenp, |
129 | int flags) | 129 | int flags) |
130 | { | 130 | { |
@@ -171,8 +171,8 @@ xfs_attr_get_int( | |||
171 | int | 171 | int |
172 | xfs_attr_get( | 172 | xfs_attr_get( |
173 | xfs_inode_t *ip, | 173 | xfs_inode_t *ip, |
174 | const char *name, | 174 | const unsigned char *name, |
175 | char *value, | 175 | unsigned char *value, |
176 | int *valuelenp, | 176 | int *valuelenp, |
177 | int flags) | 177 | int flags) |
178 | { | 178 | { |
@@ -235,8 +235,12 @@ xfs_attr_calc_size( | |||
235 | } | 235 | } |
236 | 236 | ||
237 | STATIC int | 237 | STATIC int |
238 | xfs_attr_set_int(xfs_inode_t *dp, struct xfs_name *name, | 238 | xfs_attr_set_int( |
239 | char *value, int valuelen, int flags) | 239 | struct xfs_inode *dp, |
240 | struct xfs_name *name, | ||
241 | unsigned char *value, | ||
242 | int valuelen, | ||
243 | int flags) | ||
240 | { | 244 | { |
241 | xfs_da_args_t args; | 245 | xfs_da_args_t args; |
242 | xfs_fsblock_t firstblock; | 246 | xfs_fsblock_t firstblock; |
@@ -452,8 +456,8 @@ out: | |||
452 | int | 456 | int |
453 | xfs_attr_set( | 457 | xfs_attr_set( |
454 | xfs_inode_t *dp, | 458 | xfs_inode_t *dp, |
455 | const char *name, | 459 | const unsigned char *name, |
456 | char *value, | 460 | unsigned char *value, |
457 | int valuelen, | 461 | int valuelen, |
458 | int flags) | 462 | int flags) |
459 | { | 463 | { |
@@ -600,7 +604,7 @@ out: | |||
600 | int | 604 | int |
601 | xfs_attr_remove( | 605 | xfs_attr_remove( |
602 | xfs_inode_t *dp, | 606 | xfs_inode_t *dp, |
603 | const char *name, | 607 | const unsigned char *name, |
604 | int flags) | 608 | int flags) |
605 | { | 609 | { |
606 | int error; | 610 | int error; |
@@ -669,9 +673,13 @@ xfs_attr_list_int(xfs_attr_list_context_t *context) | |||
669 | */ | 673 | */ |
670 | /*ARGSUSED*/ | 674 | /*ARGSUSED*/ |
671 | STATIC int | 675 | STATIC int |
672 | xfs_attr_put_listent(xfs_attr_list_context_t *context, int flags, | 676 | xfs_attr_put_listent( |
673 | char *name, int namelen, | 677 | xfs_attr_list_context_t *context, |
674 | int valuelen, char *value) | 678 | int flags, |
679 | unsigned char *name, | ||
680 | int namelen, | ||
681 | int valuelen, | ||
682 | unsigned char *value) | ||
675 | { | 683 | { |
676 | struct attrlist *alist = (struct attrlist *)context->alist; | 684 | struct attrlist *alist = (struct attrlist *)context->alist; |
677 | attrlist_ent_t *aep; | 685 | attrlist_ent_t *aep; |
@@ -1980,7 +1988,7 @@ xfs_attr_rmtval_get(xfs_da_args_t *args) | |||
1980 | xfs_bmbt_irec_t map[ATTR_RMTVALUE_MAPSIZE]; | 1988 | xfs_bmbt_irec_t map[ATTR_RMTVALUE_MAPSIZE]; |
1981 | xfs_mount_t *mp; | 1989 | xfs_mount_t *mp; |
1982 | xfs_daddr_t dblkno; | 1990 | xfs_daddr_t dblkno; |
1983 | xfs_caddr_t dst; | 1991 | void *dst; |
1984 | xfs_buf_t *bp; | 1992 | xfs_buf_t *bp; |
1985 | int nmap, error, tmp, valuelen, blkcnt, i; | 1993 | int nmap, error, tmp, valuelen, blkcnt, i; |
1986 | xfs_dablk_t lblkno; | 1994 | xfs_dablk_t lblkno; |
@@ -2039,7 +2047,7 @@ xfs_attr_rmtval_set(xfs_da_args_t *args) | |||
2039 | xfs_inode_t *dp; | 2047 | xfs_inode_t *dp; |
2040 | xfs_bmbt_irec_t map; | 2048 | xfs_bmbt_irec_t map; |
2041 | xfs_daddr_t dblkno; | 2049 | xfs_daddr_t dblkno; |
2042 | xfs_caddr_t src; | 2050 | void *src; |
2043 | xfs_buf_t *bp; | 2051 | xfs_buf_t *bp; |
2044 | xfs_dablk_t lblkno; | 2052 | xfs_dablk_t lblkno; |
2045 | int blkcnt, valuelen, nmap, error, tmp, committed; | 2053 | int blkcnt, valuelen, nmap, error, tmp, committed; |