diff options
| author | Toomas Soome <tsoome@me.com> | 2018-10-19 15:08:01 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-02-20 21:24:56 +0200 |
| commit | b6d49c8438f976a7c4a6c9390228076c8f132847 (patch) | |
| tree | 7780f592cc63c2cd87e54d64b688990b27fd0e7d /usr/src | |
| parent | d0cb1fb92629bc0283c88d4719df7285c1612700 (diff) | |
| download | illumos-joyent-b6d49c8438f976a7c4a6c9390228076c8f132847.tar.gz | |
10371 vfs: cast between incompatible function types
Reviewed by: Andy Stormont <astormont@racktopsystems.com>
Reviewed by: C Fraire <cfraire@me.com>
Reviewed by: Gergő Doma <domag02@gmail.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/fs/vfs.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/usr/src/uts/common/fs/vfs.c b/usr/src/uts/common/fs/vfs.c index e3884aa232..1bee02bfe6 100644 --- a/usr/src/uts/common/fs/vfs.c +++ b/usr/src/uts/common/fs/vfs.c @@ -29,7 +29,7 @@ */ /* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */ -/* All Rights Reserved */ +/* All Rights Reserved */ /* * University Copyright- Copyright (c) 1982, 1986, 1988 @@ -348,8 +348,9 @@ fs_copyfsops(const fs_operation_def_t *template, vfsops_t *actual, fs_nosys, fs_nosys, VFSNAME_FREEVFS, offsetof(vfsops_t, vfs_freevfs), - (fs_generic_func_p)fs_freevfs, - (fs_generic_func_p)fs_freevfs, /* Shouldn't fail */ + (fs_generic_func_p)(uintptr_t)fs_freevfs, + /* Shouldn't fail */ + (fs_generic_func_p)(uintptr_t)fs_freevfs, VFSNAME_VNSTATE, offsetof(vfsops_t, vfs_vnstate), (fs_generic_func_p)fs_nosys, @@ -1579,7 +1580,7 @@ domount(char *fsname, struct mounta *uap, vnode_t *vp, struct cred *credp, /* * Serialize with zone state transitions. * See vfs_list_add; zone mounted into is: - * zone_find_by_path(refstr_value(vfsp->vfs_mntpt)) + * zone_find_by_path(refstr_value(vfsp->vfs_mntpt)) * not the zone doing the mount (curproc->p_zone), but if we're already * inside a NGZ, then we know what zone we are. */ @@ -2812,8 +2813,8 @@ vfs_mnttabvp_setup(void) vnode_t *tvp; vnodeops_t *vfs_mntdummyvnops; const fs_operation_def_t mnt_dummyvnodeops_template[] = { - VOPNAME_READ, { .vop_read = vfs_mntdummyread }, - VOPNAME_WRITE, { .vop_write = vfs_mntdummywrite }, + VOPNAME_READ, { .vop_read = vfs_mntdummyread }, + VOPNAME_WRITE, { .vop_write = vfs_mntdummywrite }, VOPNAME_GETATTR, { .vop_getattr = vfs_mntdummygetattr }, VOPNAME_VNEVENT, { .vop_vnevent = fs_vnevent_support }, NULL, NULL @@ -4173,7 +4174,7 @@ vfsinit(void) VFSNAME_UNMOUNT, { .error = vfs_EIO }, VFSNAME_ROOT, { .error = vfs_EIO }, VFSNAME_STATVFS, { .error = vfs_EIO }, - VFSNAME_SYNC, { .vfs_sync = vfs_EIO_sync }, + VFSNAME_SYNC, { .vfs_sync = vfs_EIO_sync }, VFSNAME_VGET, { .error = vfs_EIO }, VFSNAME_MOUNTROOT, { .error = vfs_EIO }, VFSNAME_FREEVFS, { .error = vfs_EIO }, @@ -4186,7 +4187,7 @@ vfsinit(void) VFSNAME_UNMOUNT, { .error = vfsstray }, VFSNAME_ROOT, { .error = vfsstray }, VFSNAME_STATVFS, { .error = vfsstray }, - VFSNAME_SYNC, { .vfs_sync = vfsstray_sync }, + VFSNAME_SYNC, { .vfs_sync = vfsstray_sync }, VFSNAME_VGET, { .error = vfsstray }, VFSNAME_MOUNTROOT, { .error = vfsstray }, VFSNAME_FREEVFS, { .error = vfsstray }, |