diff options
| author | Mike Turquette <mturquette@linaro.org> | 2014-02-25 08:07:53 +0100 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-02-25 08:07:53 +0100 |
| commit | ad077ceb8a90c7ef1fc15758ed3811448181ee80 (patch) | |
| tree | dc090e24bb82c41c3785e539b9e60df6c48abfaf /fs/ceph/acl.c | |
| parent | clk: ti: am335x: remove unecessary cpu0 clk node (diff) | |
| parent | Merge branch 'clocks/fixes/drivers' of git://linuxtv.org/pinchartl/fbdev into... (diff) | |
| download | linux-ad077ceb8a90c7ef1fc15758ed3811448181ee80.tar.xz linux-ad077ceb8a90c7ef1fc15758ed3811448181ee80.zip | |
Merge branch 'clk-fixes' into clk-next
Diffstat (limited to 'fs/ceph/acl.c')
| -rw-r--r-- | fs/ceph/acl.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/fs/ceph/acl.c b/fs/ceph/acl.c index 4c2d452c4bfc..21887d63dad5 100644 --- 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; } -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; @@ -160,11 +155,7 @@ int ceph_set_acl(struct inode *inode, struct posix_acl *acl, int type) 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; |