Revert "Update module/os/linux/zfs/zfs_ctldir.c"

adamdmoss · adamdmoss · commit a4c9b0678dc5 · 2021-03-11T19:05:33.000-08:00
This reverts commit a0a9beb.
diff --git a/module/os/linux/zfs/zfs_ctldir.c b/module/os/linux/zfs/zfs_ctldir.c
@@ -591,7 +591,7 @@ zfsctl_root(znode_t *zp)
 {
 	ASSERT(zfs_has_ctldir(zp));
 	/* Must have an existing ref, so igrab() cannot return NULL */
-	zhold(ZTOZSB(zp)->z_ctldir);
+	VERIFY3P(igrab(ZTOZSB(zp)->z_ctldir), !=, NULL);
 	return (ZTOZSB(zp)->z_ctldir);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -591,7 +591,7 @@ zfsctl_root(znode_t *zp)`
`591`	`591`	`{`
`592`	`592`	`ASSERT(zfs_has_ctldir(zp));`
`593`	`593`	`/* Must have an existing ref, so igrab() cannot return NULL */`
`594`		`- zhold(ZTOZSB(zp)->z_ctldir);`
	`594`	`+ VERIFY3P(igrab(ZTOZSB(zp)->z_ctldir), !=, NULL);`
`595`	`595`	`return (ZTOZSB(zp)->z_ctldir);`
`596`	`596`	`}`
`597`	`597`