summaryrefslogtreecommitdiff
path: root/include/linux/generic_acl.h
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2014-04-03 09:26:49 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-04-03 09:26:49 -0700
commit692d96552c9a86a919fe6b5b82288a6c77c015a5 (patch)
treea9e49c040d361ea2293a8966832378def5a06714 /include/linux/generic_acl.h
parente4dbedc7eac7da9db363a36f2bd4366962eeefcc (diff)
parente2c3ecf0ea8e87c5209371af7da107ebc47a5639 (diff)
downloadlinux-next-692d96552c9a86a919fe6b5b82288a6c77c015a5.tar.gz
linux-next-692d96552c9a86a919fe6b5b82288a6c77c015a5.zip
Merge branch 'next' into for-linus
First round of input updates for 3.15.
Diffstat (limited to 'include/linux/generic_acl.h')
-rw-r--r--include/linux/generic_acl.h14
1 files changed, 0 insertions, 14 deletions
diff --git a/include/linux/generic_acl.h b/include/linux/generic_acl.h
deleted file mode 100644
index b6d657544ef1..000000000000
--- a/include/linux/generic_acl.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef LINUX_GENERIC_ACL_H
-#define LINUX_GENERIC_ACL_H
-
-#include <linux/xattr.h>
-
-struct inode;
-
-extern const struct xattr_handler generic_acl_access_handler;
-extern const struct xattr_handler generic_acl_default_handler;
-
-int generic_acl_init(struct inode *, struct inode *);
-int generic_acl_chmod(struct inode *);
-
-#endif /* LINUX_GENERIC_ACL_H */