From 7b57a7c836ab209f6f1efb93b0e9ffdc59a25534 Mon Sep 17 00:00:00 2001 From: "Christopher J. Morrone" Date: Mon, 11 Jul 2016 16:10:29 -0700 Subject: [PATCH] LU-8386 zfs: Use ZFS_MAXPROPLEN instead of ZFS_MAXNAMELEN ZFS_MAXNAMELEN was removed on zfs's master branch. We substitue ZFS_MAXPROPLEN in its place. We only used this macro in the get and set zfs property functions, so this should be a reasonable exchange. ZFS_MAXPROPLEN has also been around for a long time, so there is no need to extra logic to make lustre lustre backwards compatible with older ZFS releases. Change-Id: I7292194f1a4e0311477954f7f83a3c353e785ac8 Test-Parameters: trivial Signed-off-by: Christopher J. Morrone Reviewed-on: http://review.whamcloud.com/21251 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Nathaniel Clark --- lustre/utils/mount_utils_zfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lustre/utils/mount_utils_zfs.c b/lustre/utils/mount_utils_zfs.c index 60d5552..592f18d 100644 --- a/lustre/utils/mount_utils_zfs.c +++ b/lustre/utils/mount_utils_zfs.c @@ -142,7 +142,7 @@ static int zfs_set_prop_params(zfs_handle_t *zhp, char *params) { char *params_dup, *token, *key, *value; char *save_token = NULL; - char prop_name[ZFS_MAXNAMELEN]; + char prop_name[ZFS_MAXPROPLEN]; int ret = 0; params_dup = strdup(params); @@ -320,7 +320,7 @@ static int zfs_get_prop_params(zfs_handle_t *zhp, char *param, int len) { nvlist_t *props; nvpair_t *nvp; - char key[ZFS_MAXNAMELEN]; + char key[ZFS_MAXPROPLEN]; char *value; int ret = 0; -- 1.8.3.1