projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'asoc/topic/gpio' and 'asoc/topic/intel' into asoc...
[firefly-linux-kernel-4.4.55.git]
/
fs
/
ceph
/
acl.c
diff --git
a/fs/ceph/acl.c
b/fs/ceph/acl.c
index 4c2d452c4bfc0abad11cf3e3b0577d62ed3ef240..21887d63dad589a53e3da21fccb00c45a5c28ab6 100644
(file)
--- a/
fs/ceph/acl.c
+++ b/
fs/ceph/acl.c
@@
-54,11
+54,6
@@
static inline struct posix_acl *ceph_get_cached_acl(struct inode *inode,
return acl;
}
return acl;
}
-void ceph_forget_all_cached_acls(struct inode *inode)
-{
- forget_all_cached_acls(inode);
-}
-
struct posix_acl *ceph_get_acl(struct inode *inode, int type)
{
int size;
struct posix_acl *ceph_get_acl(struct inode *inode, int type)
{
int size;
@@
-160,11
+155,7
@@
int ceph_set_acl(struct inode *inode, struct posix_acl *acl, int type)
goto out_dput;
}
goto out_dput;
}
- if (value)
- ret = __ceph_setxattr(dentry, name, value, size, 0);
- else
- ret = __ceph_removexattr(dentry, name);
-
+ ret = __ceph_setxattr(dentry, name, value, size, 0);
if (ret) {
if (new_mode != old_mode) {
newattrs.ia_mode = old_mode;
if (ret) {
if (new_mode != old_mode) {
newattrs.ia_mode = old_mode;