summaryrefslogtreecommitdiff
path: root/fs/aufs/vfsub.h
diff options
context:
space:
mode:
Diffstat (limited to 'fs/aufs/vfsub.h')
-rw-r--r--fs/aufs/vfsub.h21
1 files changed, 21 insertions, 0 deletions
diff --git a/fs/aufs/vfsub.h b/fs/aufs/vfsub.h
index a7d8a1cf9..f2e1c49af 100644
--- a/fs/aufs/vfsub.h
+++ b/fs/aufs/vfsub.h
@@ -13,6 +13,7 @@
#include <linux/fs.h>
#include <linux/mount.h>
+#include <linux/posix_acl.h>
#include <linux/xattr.h>
#include "debug.h"
@@ -63,6 +64,12 @@ static inline int vfsub_native_ro(struct inode *inode)
|| IS_IMMUTABLE(inode);
}
+#ifdef CONFIG_AUFS_BR_FUSE
+int vfsub_test_mntns(struct vfsmount *mnt, struct super_block *h_sb);
+#else
+AuStubInt0(vfsub_test_mntns, struct vfsmount *mnt, struct super_block *h_sb);
+#endif
+
/* ---------------------------------------------------------------------- */
int vfsub_update_h_iattr(struct path *h_path, int *did);
@@ -202,6 +209,20 @@ static inline int vfsub_update_time(struct inode *h_inode, struct timespec *ts,
/* no vfsub_update_h_iattr() since we don't have struct path */
}
+#ifdef CONFIG_FS_POSIX_ACL
+static inline int vfsub_acl_chmod(struct inode *h_inode, umode_t h_mode)
+{
+ int err;
+
+ err = posix_acl_chmod(h_inode, h_mode);
+ if (err == -EOPNOTSUPP)
+ err = 0;
+ return err;
+}
+#else
+AuStubInt0(vfsub_acl_chmod, struct inode *h_inode, umode_t h_mode);
+#endif
+
long vfsub_splice_to(struct file *in, loff_t *ppos,
struct pipe_inode_info *pipe, size_t len,
unsigned int flags);