Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
This patch removes the ovs kernel modules from kvmfornfv kernel
[kvmfornfv.git]
/
kernel
/
fs
/
ceph
/
acl.c
diff --git
a/kernel/fs/ceph/acl.c
b/kernel/fs/ceph/acl.c
index
64fa248
..
4d8caeb
100644
(file)
--- a/
kernel/fs/ceph/acl.c
+++ b/
kernel/fs/ceph/acl.c
@@
-94,11
+94,9
@@
int ceph_set_acl(struct inode *inode, struct posix_acl *acl, int type)
case ACL_TYPE_ACCESS:
name = POSIX_ACL_XATTR_ACCESS;
if (acl) {
case ACL_TYPE_ACCESS:
name = POSIX_ACL_XATTR_ACCESS;
if (acl) {
- ret = posix_acl_
equiv_mode(acl, &new_mode
);
- if (ret
< 0
)
+ ret = posix_acl_
update_mode(inode, &new_mode, &acl
);
+ if (ret)
goto out;
goto out;
- if (ret == 0)
- acl = NULL;
}
break;
case ACL_TYPE_DEFAULT:
}
break;
case ACL_TYPE_DEFAULT:
@@
-187,10
+185,10
@@
int ceph_pre_init_acls(struct inode *dir, umode_t *mode,
val_size2 = posix_acl_xattr_size(default_acl->a_count);
err = -ENOMEM;
val_size2 = posix_acl_xattr_size(default_acl->a_count);
err = -ENOMEM;
- tmp_buf = kmalloc(max(val_size1, val_size2), GFP_
NOFS
);
+ tmp_buf = kmalloc(max(val_size1, val_size2), GFP_
KERNEL
);
if (!tmp_buf)
goto out_err;
if (!tmp_buf)
goto out_err;
- pagelist = kmalloc(sizeof(struct ceph_pagelist), GFP_
NOFS
);
+ pagelist = kmalloc(sizeof(struct ceph_pagelist), GFP_
KERNEL
);
if (!pagelist)
goto out_err;
ceph_pagelist_init(pagelist);
if (!pagelist)
goto out_err;
ceph_pagelist_init(pagelist);