[src/trunk]: src/external/cddl/osnet/dist/uts/common/fs/zfs dmu_objset_rename...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2c3fc61f2eb7
branches:  trunk
changeset: 813802:2c3fc61f2eb7
user:      joerg <joerg%NetBSD.org@localhost>
date:      Fri Feb 19 19:25:22 2016 +0000

description:
dmu_objset_rename is an alias for dsl_dataset_rename, but differs in
constness of the first argument. Newer clang checks for this and
prohibits it, so just be consistent by constifying the latter.

diffstat:

 external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dataset.c     |  2 +-
 external/cddl/osnet/dist/uts/common/fs/zfs/sys/dsl_dataset.h |  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r bc638cccc631 -r 2c3fc61f2eb7 external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dataset.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dataset.c  Fri Feb 19 18:47:24 2016 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dataset.c  Fri Feb 19 19:25:22 2016 +0000
@@ -2304,7 +2304,7 @@
 
 #pragma weak dmu_objset_rename = dsl_dataset_rename
 int
-dsl_dataset_rename(char *oldname, const char *newname, boolean_t recursive)
+dsl_dataset_rename(const char *oldname, const char *newname, boolean_t recursive)
 {
        dsl_dir_t *dd;
        dsl_dataset_t *ds;
diff -r bc638cccc631 -r 2c3fc61f2eb7 external/cddl/osnet/dist/uts/common/fs/zfs/sys/dsl_dataset.h
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/sys/dsl_dataset.h      Fri Feb 19 18:47:24 2016 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/sys/dsl_dataset.h      Fri Feb 19 19:25:22 2016 +0000
@@ -192,7 +192,7 @@
 dsl_syncfunc_t dsl_dataset_destroy_sync;
 dsl_checkfunc_t dsl_dataset_snapshot_check;
 dsl_syncfunc_t dsl_dataset_snapshot_sync;
-int dsl_dataset_rename(char *name, const char *newname, boolean_t recursive);
+int dsl_dataset_rename(const char *name, const char *newname, boolean_t recursive);
 int dsl_dataset_promote(const char *name, char *conflsnap);
 int dsl_dataset_clone_swap(dsl_dataset_t *clone, dsl_dataset_t *origin_head,
     boolean_t force);