]> granicus.if.org Git - zfs/commitdiff
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
authorBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 28 May 2010 21:49:40 +0000 (14:49 -0700)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 28 May 2010 21:49:40 +0000 (14:49 -0700)
Conflicts:
lib/libzfs/libzfs_changelist.c
module/zfs/spa.c
module/zfs/zfs_ioctl.c

1  2 
cmd/zinject/translate.c
lib/libzfs/libzfs_changelist.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_pool.c
module/zfs/arc.c
module/zfs/spa.c
module/zfs/vdev_label.c
module/zfs/zfs_ioctl.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index fc49787d527102115d3bb5e9d70805edc44761a3,d7c5de0d357a2fab7e3a281ed52196aab97519c8..4a91772ae7d90715fdac1d326a56390e8b8389fc
@@@ -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)
Simple merge
Simple merge