diff options
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_ioctl32.c')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_ioctl32.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/linux-2.6/xfs_ioctl32.c b/fs/xfs/linux-2.6/xfs_ioctl32.c index be1527b1670c..0bf6d61f0528 100644 --- a/fs/xfs/linux-2.6/xfs_ioctl32.c +++ b/fs/xfs/linux-2.6/xfs_ioctl32.c | |||
@@ -411,7 +411,7 @@ xfs_compat_attrmulti_by_handle( | |||
411 | compat_xfs_fsop_attrmulti_handlereq_t am_hreq; | 411 | compat_xfs_fsop_attrmulti_handlereq_t am_hreq; |
412 | struct dentry *dentry; | 412 | struct dentry *dentry; |
413 | unsigned int i, size; | 413 | unsigned int i, size; |
414 | char *attr_name; | 414 | unsigned char *attr_name; |
415 | 415 | ||
416 | if (!capable(CAP_SYS_ADMIN)) | 416 | if (!capable(CAP_SYS_ADMIN)) |
417 | return -XFS_ERROR(EPERM); | 417 | return -XFS_ERROR(EPERM); |
@@ -440,7 +440,7 @@ xfs_compat_attrmulti_by_handle( | |||
440 | 440 | ||
441 | error = 0; | 441 | error = 0; |
442 | for (i = 0; i < am_hreq.opcount; i++) { | 442 | for (i = 0; i < am_hreq.opcount; i++) { |
443 | ops[i].am_error = strncpy_from_user(attr_name, | 443 | ops[i].am_error = strncpy_from_user((char *)attr_name, |
444 | compat_ptr(ops[i].am_attrname), | 444 | compat_ptr(ops[i].am_attrname), |
445 | MAXNAMELEN); | 445 | MAXNAMELEN); |
446 | if (ops[i].am_error == 0 || ops[i].am_error == MAXNAMELEN) | 446 | if (ops[i].am_error == 0 || ops[i].am_error == MAXNAMELEN) |