Fix 'zfs get {user|group}objused@' functionality

Fix a regression accidentally introduced in 1b81ab4 that prevents 'zfs get {user|group}objused@' from correctly reporting the requested value. Update "userspace_003_pos.ksh" and "groupspace_003_pos.ksh" to verify this functionality. Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: George Melikov <[email protected]> Reviewed-by: Giuseppe Di Natale <[email protected]> Signed-off-by: loli10K <[email protected]> Closes openzfs#6908 Requires-spl: refs/pull/669/head
tonyhutter · Nov 29, 2017 · 01be745 · 01be745
1 parent 3e2755d
commit 01be745
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/module/zfs/zfs_vfsops.c b/module/zfs/zfs_vfsops.c
@@ -740,7 +740,7 @@ zfs_userspace_one(zfsvfs_t *zfsvfs, zfs_userquota_prop_t type,
 		return (0);
 
 	if (type == ZFS_PROP_USEROBJUSED || type == ZFS_PROP_GROUPOBJUSED) {
-		strlcpy(buf, DMU_OBJACCT_PREFIX, DMU_OBJACCT_PREFIX_LEN);
+		strlcpy(buf, DMU_OBJACCT_PREFIX, DMU_OBJACCT_PREFIX_LEN + 1);
 		offset = DMU_OBJACCT_PREFIX_LEN;
 	}
 

diff --git a/tests/zfs-tests/tests/functional/userquota/groupspace_003_pos.ksh b/tests/zfs-tests/tests/functional/userquota/groupspace_003_pos.ksh
@@ -30,6 +30,7 @@
 #
 
 . $STF_SUITE/include/libtest.shlib
+. $STF_SUITE/include/math.shlib
 . $STF_SUITE/tests/functional/userquota/userquota_common.kshlib
 
 #
@@ -56,10 +57,15 @@ function cleanup
 function group_object_count
 {
 	typeset fs=$1
-	typeset user=$2
-	typeset cnt=$(zfs groupspace -oname,objused $fs | grep $user |
-			awk '{print $2}')
-	echo $cnt
+	typeset group=$2
+	typeset -i groupspacecnt=$(zfs groupspace -oname,objused $fs |
+	    awk /$group/'{print $2}')
+	typeset -i zfsgetcnt=$(zfs get -H -ovalue groupobjused@$group $fs)
+
+	# 'zfs groupspace' and 'zfs get groupobjused@' should be equal
+	verify_eq "$groupspacecnt" "$zfsgetcnt" "groupobjused@$group"
+
+	echo $groupspacecnt
 }
 
 log_onexit cleanup

diff --git a/tests/zfs-tests/tests/functional/userquota/userspace_003_pos.ksh b/tests/zfs-tests/tests/functional/userquota/userspace_003_pos.ksh
@@ -30,6 +30,7 @@
 #
 
 . $STF_SUITE/include/libtest.shlib
+. $STF_SUITE/include/math.shlib
 . $STF_SUITE/tests/functional/userquota/userquota_common.kshlib
 
 #
@@ -58,9 +59,14 @@ function user_object_count
 {
 	typeset fs=$1
 	typeset user=$2
-	typeset cnt=$(zfs userspace -oname,objused $fs |
+	typeset -i userspacecnt=$(zfs userspace -oname,objused $fs |
 	    awk /$user/'{print $2}')
-	echo $cnt
+	typeset -i zfsgetcnt=$(zfs get -H -ovalue userobjused@$user $fs)
+
+	# 'zfs userspace' and 'zfs get userobjused@' should be equal
+	verify_eq "$userspacecnt" "$zfsgetcnt" "userobjused@$user"
+
+	echo $userspacecnt
 }
 
 log_onexit cleanup