diff options
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_acl.c')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_acl.c | 11 | 
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/xfs/linux-2.6/xfs_acl.c b/fs/xfs/linux-2.6/xfs_acl.c index 883ca5ab8af5..bf85bbe4a9ae 100644 --- a/fs/xfs/linux-2.6/xfs_acl.c +++ b/fs/xfs/linux-2.6/xfs_acl.c  | |||
| @@ -106,7 +106,7 @@ xfs_get_acl(struct inode *inode, int type) | |||
| 106 | struct posix_acl *acl; | 106 | struct posix_acl *acl; | 
| 107 | struct xfs_acl *xfs_acl; | 107 | struct xfs_acl *xfs_acl; | 
| 108 | int len = sizeof(struct xfs_acl); | 108 | int len = sizeof(struct xfs_acl); | 
| 109 | char *ea_name; | 109 | unsigned char *ea_name; | 
| 110 | int error; | 110 | int error; | 
| 111 | 111 | ||
| 112 | acl = get_cached_acl(inode, type); | 112 | acl = get_cached_acl(inode, type); | 
| @@ -133,7 +133,8 @@ xfs_get_acl(struct inode *inode, int type) | |||
| 133 | if (!xfs_acl) | 133 | if (!xfs_acl) | 
| 134 | return ERR_PTR(-ENOMEM); | 134 | return ERR_PTR(-ENOMEM); | 
| 135 | 135 | ||
| 136 | error = -xfs_attr_get(ip, ea_name, (char *)xfs_acl, &len, ATTR_ROOT); | 136 | error = -xfs_attr_get(ip, ea_name, (unsigned char *)xfs_acl, | 
| 137 | &len, ATTR_ROOT); | ||
| 137 | if (error) { | 138 | if (error) { | 
| 138 | /* | 139 | /* | 
| 139 | * If the attribute doesn't exist make sure we have a negative | 140 | * If the attribute doesn't exist make sure we have a negative | 
| @@ -162,7 +163,7 @@ STATIC int | |||
| 162 | xfs_set_acl(struct inode *inode, int type, struct posix_acl *acl) | 163 | xfs_set_acl(struct inode *inode, int type, struct posix_acl *acl) | 
| 163 | { | 164 | { | 
| 164 | struct xfs_inode *ip = XFS_I(inode); | 165 | struct xfs_inode *ip = XFS_I(inode); | 
| 165 | char *ea_name; | 166 | unsigned char *ea_name; | 
| 166 | int error; | 167 | int error; | 
| 167 | 168 | ||
| 168 | if (S_ISLNK(inode->i_mode)) | 169 | if (S_ISLNK(inode->i_mode)) | 
| @@ -194,7 +195,7 @@ xfs_set_acl(struct inode *inode, int type, struct posix_acl *acl) | |||
| 194 | (sizeof(struct xfs_acl_entry) * | 195 | (sizeof(struct xfs_acl_entry) * | 
| 195 | (XFS_ACL_MAX_ENTRIES - acl->a_count)); | 196 | (XFS_ACL_MAX_ENTRIES - acl->a_count)); | 
| 196 | 197 | ||
| 197 | error = -xfs_attr_set(ip, ea_name, (char *)xfs_acl, | 198 | error = -xfs_attr_set(ip, ea_name, (unsigned char *)xfs_acl, | 
| 198 | len, ATTR_ROOT); | 199 | len, ATTR_ROOT); | 
| 199 | 200 | ||
| 200 | kfree(xfs_acl); | 201 | kfree(xfs_acl); | 
| @@ -262,7 +263,7 @@ xfs_set_mode(struct inode *inode, mode_t mode) | |||
| 262 | } | 263 | } | 
| 263 | 264 | ||
| 264 | static int | 265 | static int | 
| 265 | xfs_acl_exists(struct inode *inode, char *name) | 266 | xfs_acl_exists(struct inode *inode, unsigned char *name) | 
| 266 | { | 267 | { | 
| 267 | int len = sizeof(struct xfs_acl); | 268 | int len = sizeof(struct xfs_acl); | 
| 268 | 269 | ||
