From 38416ccac3970b2bf63fe218ef85d535d848302c Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 10 Oct 2012 17:00:42 +1100 Subject: [PATCH] vfs: Use a blocking function in vfs_zfsacl for system ACL blobs This is so we do not query some other module for the ACL blob, as zfs ACLs are not posix ACLs. We may add a linearisation later. Andrew Bartlett --- source3/modules/vfs_zfsacl.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/source3/modules/vfs_zfsacl.c b/source3/modules/vfs_zfsacl.c index bf068814627..b95baa5d876 100644 --- a/source3/modules/vfs_zfsacl.c +++ b/source3/modules/vfs_zfsacl.c @@ -301,11 +301,23 @@ static int zfsacl_fail__sys_acl_delete_def_file(vfs_handle_struct *handle, return -1; } +static int zfsacl_fail__sys_acl_blob_get_file(vfs_handle_struct *handle, const char *path_p, TALLOC_CTX *mem_ctx, char **blob_description, DATA_BLOB *blob) +{ + return -1; +} + +static int zfsacl_fail__skel_sys_acl_blob_get_fd(vfs_handle_struct *handle, files_struct *fsp, TALLOC_CTX *mem_ctx, char **blob_description, DATA_BLOB *blob) +{ + return -1; +} + /* VFS operations structure */ static struct vfs_fn_pointers zfsacl_fns = { .sys_acl_get_file_fn = zfsacl_fail__sys_acl_get_file, .sys_acl_get_fd_fn = zfsacl_fail__sys_acl_get_fd, + .sys_acl_blob_get_file_fn = zfsacl_fail__sys_acl_blob_get_file, + .sys_acl_blob_get_fd_fn = zfsacl_fail__sys_acl_blob_get_fd, .sys_acl_set_file_fn = zfsacl_fail__sys_acl_set_file, .sys_acl_set_fd_fn = zfsacl_fail__sys_acl_set_fd, .sys_acl_delete_def_file_fn = zfsacl_fail__sys_acl_delete_def_file, -- 2.11.4.GIT