summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorGuangliang Zhao <lucienchao@gmail.com>2014-02-16 17:35:52 +0100
committerSage Weil <sage@inktank.com>2014-02-17 21:37:12 +0100
commitc969d9bf91e1868d823351993216cd64dfab6a4c (patch)
tree5b32d972ae9597b164f6314387fcb69c4e5a0768 /fs
parentceph: add missing init_acl() for mkdir() and atomic_open() (diff)
downloadlinux-c969d9bf91e1868d823351993216cd64dfab6a4c.tar.xz
linux-c969d9bf91e1868d823351993216cd64dfab6a4c.zip
ceph: make ceph_forget_all_cached_acls() static inline
Signed-off-by: Guangliang Zhao <lucienchao@gmail.com> Reviewed-by: Alex Elder <elder@linaro.org> Signed-off-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/ceph/acl.c5
-rw-r--r--fs/ceph/super.h7
2 files changed, 6 insertions, 6 deletions
diff --git a/fs/ceph/acl.c b/fs/ceph/acl.c
index accc9f28bc10..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;
diff --git a/fs/ceph/super.h b/fs/ceph/super.h
index 19793b56d0a7..d8801a95b685 100644
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -13,6 +13,7 @@
#include <linux/wait.h>
#include <linux/writeback.h>
#include <linux/slab.h>
+#include <linux/posix_acl.h>
#include <linux/ceph/libceph.h>
@@ -743,7 +744,11 @@ extern const struct xattr_handler *ceph_xattr_handlers[];
struct posix_acl *ceph_get_acl(struct inode *, int);
int ceph_set_acl(struct inode *inode, struct posix_acl *acl, int type);
int ceph_init_acl(struct dentry *, struct inode *, struct inode *);
-void ceph_forget_all_cached_acls(struct inode *inode);
+
+static inline void ceph_forget_all_cached_acls(struct inode *inode)
+{
+ forget_all_cached_acls(inode);
+}
#else