git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
fs
/
ext3
/
acl.c
diff --git
a/fs/ext3/acl.c
b/fs/ext3/acl.c
index
0d21d55
..
1e5038d
100644
(file)
--- a/
fs/ext3/acl.c
+++ b/
fs/ext3/acl.c
@@
-90,8
+90,8
@@
ext3_acl_to_disk(const struct posix_acl *acl, size_t *size)
size_t n;
*size = ext3_acl_size(acl->a_count);
size_t n;
*size = ext3_acl_size(acl->a_count);
- ext_acl =
(ext3_acl_header *)kmalloc(sizeof(ext3_acl_header) +
-
acl->a_count *
sizeof(ext3_acl_entry), GFP_KERNEL);
+ ext_acl =
kmalloc(sizeof(ext3_acl_header) + acl->a_count *
+
sizeof(ext3_acl_entry), GFP_KERNEL);
if (!ext_acl)
return ERR_PTR(-ENOMEM);
ext_acl->a_version = cpu_to_le32(EXT3_ACL_VERSION);
if (!ext_acl)
return ERR_PTR(-ENOMEM);
ext_acl->a_version = cpu_to_le32(EXT3_ACL_VERSION);
@@
-258,7
+258,7
@@
ext3_set_acl(handle_t *handle, struct inode *inode, int type,
default:
return -EINVAL;
}
default:
return -EINVAL;
}
- if (acl) {
+ if (acl) {
value = ext3_acl_to_disk(acl, &size);
if (IS_ERR(value))
return (int)PTR_ERR(value);
value = ext3_acl_to_disk(acl, &size);
if (IS_ERR(value))
return (int)PTR_ERR(value);