Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / fs / ceph / acl.c

diff --git a/fs/ceph/acl.c b/fs/ceph/acl.c
index 5bd853ba44ffccfc39b45b511e6f3b31bd3c1e37..64fa248343f65461db232ee4ae0939beff0fc05c 100644 (file)
--- a/fs/ceph/acl.c
+++ b/fs/ceph/acl.c
@@ -40,20 +40,6 @@ static inline void ceph_set_cached_acl(struct inode *inode,
        spin_unlock(&ci->i_ceph_lock);
 }
 
-static inline struct posix_acl *ceph_get_cached_acl(struct inode *inode,
-                                                       int type)
-{
-       struct ceph_inode_info *ci = ceph_inode(inode);
-       struct posix_acl *acl = ACL_NOT_CACHED;
-
-       spin_lock(&ci->i_ceph_lock);
-       if (__ceph_caps_issued_mask(ci, CEPH_CAP_XATTR_SHARED, 0))
-               acl = get_cached_acl(inode, type);
-       spin_unlock(&ci->i_ceph_lock);
-
-       return acl;
-}
-
 struct posix_acl *ceph_get_acl(struct inode *inode, int type)
 {
        int size;