Mercurial > illumos > git > illumos-joyent
changeset 24338:735e7a0792b5
12036 iscsi: zpool create pool fails to create label
Reviewed by: Rick McNeal <rick.mcneal@nexenta.com>
Reviewed by: C Fraire <cfraire@me.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Reviewed by: John Levon <john.levon@joyent.com>
Reviewed by: Kody Kantor <kody.kantor@joyent.com>
Approved by: Dan McDonald <danmcd@joyent.com>
| author | Jerry Jelinek <jerry.jelinek@joyent.com> |
|---|---|
| date | Wed, 27 Nov 2019 10:13:36 -0700 |
| parents | 56fef6365e18 |
| children | e1e56202a7e4 |
| files | usr/src/uts/common/io/comstar/lu/stmf_sbd/sbd_scsi.c |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/uts/common/io/comstar/lu/stmf_sbd/sbd_scsi.c Mon Nov 25 09:14:10 2019 +0200 +++ b/usr/src/uts/common/io/comstar/lu/stmf_sbd/sbd_scsi.c Wed Nov 27 10:13:36 2019 -0700 @@ -23,6 +23,7 @@ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright 2017 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2013 by Delphix. All rights reserved. + * Copyright 2019 Joyent, Inc. */ #include <sys/conf.h> @@ -3988,8 +3989,7 @@ sbd_status_t sbd_flush_data_cache(sbd_lu_t *sl, int fsync_done) { - int r = 0; - sbd_status_t ret; + sbd_status_t ret = SBD_SUCCESS; rw_enter(&sl->sl_access_state_lock, RW_READER); if ((sl->sl_flags & SL_MEDIA_LOADED) == 0) { @@ -4007,6 +4007,8 @@ over_fsync: if (((sl->sl_data_vtype == VCHR) || (sl->sl_data_vtype == VBLK)) && ((sl->sl_flags & SL_NO_DATA_DKIOFLUSH) == 0)) { + int r = 0; + ret = VOP_IOCTL(sl->sl_data_vp, DKIOCFLUSHWRITECACHE, 0, FKIOCTL, kcred, &r, NULL); if ((ret == ENOTTY) || (ret == ENOTSUP)) {