aboutsummaryrefslogtreecommitdiff
path: root/fs/ocfs2/acl.h
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2016-05-24 12:17:43 +0800
committerAlex Shi <alex.shi@linaro.org>2016-05-24 12:17:43 +0800
commit6c1be3bf831c5b1f2ba51425315287df2c350633 (patch)
treefd07371829b4b5ea7db114502ac12fd989aa4e2a /fs/ocfs2/acl.h
parentada3625ee9203002b2cac60be802dae952ae3e22 (diff)
parent3b6aa07b936b09d38c1bfcee1e06845b968df475 (diff)
Merge tag 'v3.18.34' into linux-linaro-lsk-v3.18lsk-v3.18-16.05
This is the 3.18.34 stable release
Diffstat (limited to 'fs/ocfs2/acl.h')
-rw-r--r--fs/ocfs2/acl.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/ocfs2/acl.h b/fs/ocfs2/acl.h
index 3fce68d08625..2783a75b3999 100644
--- a/fs/ocfs2/acl.h
+++ b/fs/ocfs2/acl.h
@@ -35,5 +35,10 @@ int ocfs2_set_acl(handle_t *handle,
struct posix_acl *acl,
struct ocfs2_alloc_context *meta_ac,
struct ocfs2_alloc_context *data_ac);
+extern int ocfs2_acl_chmod(struct inode *, struct buffer_head *);
+extern int ocfs2_init_acl(handle_t *, struct inode *, struct inode *,
+ struct buffer_head *, struct buffer_head *,
+ struct ocfs2_alloc_context *,
+ struct ocfs2_alloc_context *);
#endif /* OCFS2_ACL_H */