From 798cf6330948557d16f500d658c71358fab105e7 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 7 Jul 2009 14:18:47 -0700 Subject: [PATCH 1/2] New topic branch for minor acl related fixes --- .topdeps | 1 + .topmsg | 6 ++++++ lib/libzfs/libzfs_dataset.c | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .topdeps create mode 100644 .topmsg diff --git a/.topdeps b/.topdeps new file mode 100644 index 0000000000..1f7391f92b --- /dev/null +++ b/.topdeps @@ -0,0 +1 @@ +master diff --git a/.topmsg b/.topmsg new file mode 100644 index 0000000000..e6a0de33b9 --- /dev/null +++ b/.topmsg @@ -0,0 +1,6 @@ +From: Brian Behlendorf +Subject: [PATCH] fix acl + +Minor fixes for newly introduced acl support. + +Signed-off-by: Brian Behlendorf diff --git a/lib/libzfs/libzfs_dataset.c b/lib/libzfs/libzfs_dataset.c index ac91226055..454a08b2ed 100644 --- a/lib/libzfs/libzfs_dataset.c +++ b/lib/libzfs/libzfs_dataset.c @@ -3987,7 +3987,7 @@ zfs_smb_acl_mgmt(libzfs_handle_t *hdl, char *dataset, char *path, if (cmd == ZFS_SMB_ACL_RENAME) { if (nvlist_alloc(&nvlist, NV_UNIQUE_NAME, 0) != 0) { (void) no_memory(hdl); - return (NULL); + return (-1); } } From 5bcfa12766c521301ca4af197873d4d2377dc54f Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Tue, 7 Jul 2009 14:19:31 -0700 Subject: [PATCH 2/2] New TopGit dependency: fix-acl --- .topdeps | 1 + 1 file changed, 1 insertion(+) diff --git a/.topdeps b/.topdeps index 21d0426997..47c29f0907 100644 --- a/.topdeps +++ b/.topdeps @@ -12,3 +12,4 @@ fix-taskq fix-list fix-strncat fix-deadcode +fix-acl