X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fdsl_prop.c;h=af99d7415302766007a734ba61c167fa4f073ce2;hb=5fed499defe68b57fab349ac945a84416fb024ba;hp=aa66b32e79388cbe0b7cc68caf33a33c30ca9bdf;hpb=428870ff734fdaccc342b33fc53cf94724409a46;p=zfs.git

diff --git a/module/zfs/dsl_prop.c b/module/zfs/dsl_prop.c
index aa66b32..af99d74 100644
--- a/module/zfs/dsl_prop.c
+++ b/module/zfs/dsl_prop.c
@@ -413,6 +413,8 @@ dsl_prop_check_prediction(dsl_dir_t *dd, dsl_prop_setarg_t *psa)
 		case ZFS_PROP_QUOTA:
 		case ZFS_PROP_RESERVATION:
 			return;
+		default:
+			break;
 		}
 	}
 
@@ -828,7 +830,7 @@ dsl_props_set(const char *dsname, zprop_source_t source, nvlist_t *props)
 	dsl_props_arg_t pa;
 	int err;
 
-	if (err = dsl_dataset_hold(dsname, FTAG, &ds))
+	if ((err = dsl_dataset_hold(dsname, FTAG, &ds)))
 		return (err);
 	/*
 	 * Do these checks before the syncfunc, since it can't fail.