Module Name: src
Committed By: joerg
Date: Fri Feb 19 19:25:22 UTC 2016
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: dsl_dataset.c
src/external/cddl/osnet/dist/uts/common/fs/zfs/sys: dsl_dataset.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dataset.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/dsl_dataset.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dataset.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dataset.c:1.1.1.2 src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dataset.c:1.2
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dataset.c:1.1.1.2 Sat Feb 27 22:30:55 2010
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dataset.c Fri Feb 19 19:25:22 2016
@@ -2304,7 +2304,7 @@ dsl_valid_rename(const char *oldname, vo
#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;
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/dsl_dataset.h
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/dsl_dataset.h:1.1.1.2 src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/dsl_dataset.h:1.2
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/dsl_dataset.h:1.1.1.2 Sat Feb 27 22:31:40 2010
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/dsl_dataset.h Fri Feb 19 19:25:22 2016
@@ -192,7 +192,7 @@ dsl_checkfunc_t dsl_dataset_destroy_chec
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);
