diff options
| author | pjd <pjd@FreeBSD.org> | 2011-03-06 01:22:14 +0000 |
|---|---|---|
| committer | pjd <pjd@FreeBSD.org> | 2011-03-06 01:22:14 +0000 |
| commit | 248b05034f286b1de66f77f234de653d6aafd915 (patch) | |
| tree | eb4b0408782157c6afc34cf48a54461666294949 | |
| parent | 079987238507c177bc3534073033a00a4f9d9d5f (diff) | |
| download | FreeBSD-src-248b05034f286b1de66f77f234de653d6aafd915.zip FreeBSD-src-248b05034f286b1de66f77f234de653d6aafd915.tar.gz | |
Fix libzpool build.
MFC after: 1 month
3 files changed, 5 insertions, 1 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c index 3dd59bc..7170aba 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c @@ -2336,7 +2336,9 @@ dsl_dataset_snapshot_rename_sync(void *arg1, void *arg2, dmu_tx_t *tx) ds->ds_snapname, 8, 1, &ds->ds_object, tx); ASSERT3U(err, ==, 0); dsl_dataset_name(ds, newname); +#ifdef _KERNEL zvol_rename_minors(oldname, newname); +#endif spa_history_log_internal(LOG_DS_RENAME, dd->dd_pool->dp_spa, tx, "dataset = %llu", ds->ds_object); diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c index 79f45f2..013e811 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c @@ -1344,7 +1344,9 @@ dsl_dir_rename_sync(void *arg1, void *arg2, dmu_tx_t *tx) dd->dd_myname, 8, 1, &dd->dd_object, tx); ASSERT3U(err, ==, 0); dsl_dir_name(dd, newname); +#ifdef _KERNEL zvol_rename_minors(oldname, newname); +#endif spa_history_log_internal(LOG_DS_RENAME, dd->dd_pool->dp_spa, tx, "dataset = %llu", dd->dd_phys->dd_head_dataset_obj); diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h index 4da5b84..c813797 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h @@ -76,7 +76,7 @@ extern int zvol_create_minors(const char *name); extern void zvol_rename_minors(const char *oldname, const char *newname); #endif -#endif +#endif /* _KERNEL */ #ifdef __cplusplus } |
