From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 28 May 2010 21:49:40 +0000 (-0700)
Subject: Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
X-Git-Tag: zfs-0.5.0~38^2^2~1^2^2~34^2~1^2^2~7^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=abfb2a3e1d29ec3cc4b2f88a21aa6b0e749ab1e0;p=zfs

Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case

Conflicts:
	lib/libzfs/libzfs_changelist.c
	module/zfs/spa.c
	module/zfs/zfs_ioctl.c
---

abfb2a3e1d29ec3cc4b2f88a21aa6b0e749ab1e0
diff --cc module/zfs/spa.c
index fc49787d5,d7c5de0d3..4a91772ae
--- a/module/zfs/spa.c
+++ b/module/zfs/spa.c
@@@ -432,8 -458,16 +458,19 @@@ spa_prop_validate(spa_t *spa, nvlist_t 
  			    strcmp(slash, "/..") == 0)
  				error = EINVAL;
  			break;
+ 
+ 		case ZPOOL_PROP_DEDUPDITTO:
+ 			if (spa_version(spa) < SPA_VERSION_DEDUP)
+ 				error = ENOTSUP;
+ 			else
+ 				error = nvpair_value_uint64(elem, &intval);
+ 			if (error == 0 &&
+ 			    intval != 0 && intval < ZIO_DEDUPDITTO_MIN)
+ 				error = EINVAL;
+ 			break;
++
 +		default:
 +			break;
  		}
  
  		if (error)