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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
fs
/
reiserfs
/
xattr_acl.c
diff --git
a/fs/reiserfs/xattr_acl.c
b/fs/reiserfs/xattr_acl.c
index
9df778a
..
5296a29
100644
(file)
--- a/
fs/reiserfs/xattr_acl.c
+++ b/
fs/reiserfs/xattr_acl.c
@@
-135,7
+135,7
@@
static void *posix_acl_to_disk(const struct posix_acl *acl, size_t * size)
int n;
*size = reiserfs_acl_size(acl->a_count);
int n;
*size = reiserfs_acl_size(acl->a_count);
- ext_acl =
(reiserfs_acl_header *)
kmalloc(sizeof(reiserfs_acl_header) +
+ ext_acl = kmalloc(sizeof(reiserfs_acl_header) +
acl->a_count *
sizeof(reiserfs_acl_entry),
GFP_NOFS);
acl->a_count *
sizeof(reiserfs_acl_entry),
GFP_NOFS);
@@
-182,7
+182,7
@@
struct posix_acl *reiserfs_get_acl(struct inode *inode, int type)
{
char *name, *value;
struct posix_acl *acl, **p_acl;
{
char *name, *value;
struct posix_acl *acl, **p_acl;
-
size_
t size;
+
in
t size;
int retval;
struct reiserfs_inode_info *reiserfs_i = REISERFS_I(inode);
int retval;
struct reiserfs_inode_info *reiserfs_i = REISERFS_I(inode);
@@
-206,7
+206,7
@@
struct posix_acl *reiserfs_get_acl(struct inode *inode, int type)
return posix_acl_dup(*p_acl);
size = reiserfs_xattr_get(inode, name, NULL, 0);
return posix_acl_dup(*p_acl);
size = reiserfs_xattr_get(inode, name, NULL, 0);
- if (
(int)
size < 0) {
+ if (size < 0) {
if (size == -ENODATA || size == -ENOSYS) {
*p_acl = ERR_PTR(-ENODATA);
return NULL;
if (size == -ENODATA || size == -ENOSYS) {
*p_acl = ERR_PTR(-ENODATA);
return NULL;