diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-12-07 12:47:12 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-12-07 12:47:12 +0000 |
| commit | a1b5b02d283a933de7f074a68398486a187f7e67 (patch) | |
| tree | e2b2b71ff380bf5663f7063501c0a991617e6d2a /usr/src/uts/common/sys/vfs.h | |
| parent | 7662705473b5736c9bcb3d7ace7cd1ae5c2f784d (diff) | |
| parent | fdff6cea3adcb1f377a673bc22c427ce25917f05 (diff) | |
| download | illumos-joyent-release-20161208.tar.gz | |
[illumos-gate merge]release-20161208
commit fdff6cea3adcb1f377a673bc22c427ce25917f05
7652 libficl build should depend on libuuid
commit 3f11de9ddb9e8b567df284c7f495ac53076611c4
7605 we should not attempt to write to ZFS while panicing
Diffstat (limited to 'usr/src/uts/common/sys/vfs.h')
| -rw-r--r-- | usr/src/uts/common/sys/vfs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/uts/common/sys/vfs.h b/usr/src/uts/common/sys/vfs.h index fc6e22b3a2..07736d2b69 100644 --- a/usr/src/uts/common/sys/vfs.h +++ b/usr/src/uts/common/sys/vfs.h @@ -22,6 +22,7 @@ * Copyright (c) 1988, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2015 Nexenta Systems, Inc. All rights reserved. * Copyright 2016 Toomas Soome <tsoome@me.com> + * Copyright (c) 2016 by Delphix. All rights reserved. */ /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ @@ -513,7 +514,6 @@ int vfs_optionisset(const struct vfs *, const char *, char **); int vfs_settag(uint_t, uint_t, const char *, const char *, cred_t *); int vfs_clrtag(uint_t, uint_t, const char *, const char *, cred_t *); void vfs_syncall(void); -void vfs_syncprogress(void); void vfsinit(void); void vfs_unmountall(void); void vfs_make_fsid(fsid_t *, dev_t, int); |