From: Ryan Moeller <freqlabs@FreeBSD.org>
Date: Sat, 29 Aug 2020 18:25:56 +0000 (+0000)
Subject: FreeBSD: Define crgetzoneid appropriately
X-Git-Tag: zfs-2.0.0~192
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=bbba0b7f939e59a82b509905f369a89f5d6b5bcf;p=mirror_zfs.git

FreeBSD: Define crgetzoneid appropriately

The previous ZFS implementation on FreeBSD had ifdefs to use jailed()
instead of crgetzoneid() in dsl_dir.c, however we can simply provide an
appropriate definition of crgetzoneid for the same effect.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <freqlabs@FreeBSD.org>
Closes #10851
---

diff --git a/include/os/freebsd/spl/sys/cred.h b/include/os/freebsd/spl/sys/cred.h
index e32910e0e..86f79011d 100644
--- a/include/os/freebsd/spl/sys/cred.h
+++ b/include/os/freebsd/spl/sys/cred.h
@@ -93,7 +93,7 @@ extern cred_t *zone_kcred(void);
 extern gid_t crgetrgid(const cred_t *);
 extern gid_t crgetsgid(const cred_t *);
 
-#define	crgetzoneid(x) (0)
+#define	crgetzoneid(cr) ((cr)->cr_prison->pr_id)
 extern projid_t crgetprojid(const cred_t *);
 
 extern cred_t *crgetmapped(const cred_t *);