View | Details | Raw Unified | Return to bug 195061 | Differences between
and this patch

Collapse All | Expand All

(-)sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c (-3 / +10 lines)
Lines 129-134 skip_open: Link Here
129
		return (error);
129
		return (error);
130
	}
130
	}
131
131
132
	vd->vdev_notrim = B_TRUE;
133
132
	*max_psize = *psize = vattr.va_size;
134
	*max_psize = *psize = vattr.va_size;
133
	*logical_ashift = SPA_MINBLOCKSHIFT;
135
	*logical_ashift = SPA_MINBLOCKSHIFT;
134
	*physical_ashift = SPA_MINBLOCKSHIFT;
136
	*physical_ashift = SPA_MINBLOCKSHIFT;
Lines 171-181 vdev_file_io_start(zio_t *zio) Link Here
171
	vf = vd->vdev_tsd;
173
	vf = vd->vdev_tsd;
172
	vp = vf->vf_vnode;
174
	vp = vf->vf_vnode;
173
175
174
	if (zio->io_type == ZIO_TYPE_IOCTL) {
176
	switch (zio->io_type) {
177
	case ZIO_TYPE_IOCTL:
175
		switch (zio->io_cmd) {
178
		switch (zio->io_cmd) {
176
		case DKIOCFLUSHWRITECACHE:
179
		case DKIOCFLUSHWRITECACHE:
177
			zio->io_error = VOP_FSYNC(vp, FSYNC | FDSYNC,
180
			zio->io_error = VOP_FSYNC(vp, FSYNC | FDSYNC, kcred,
178
			    kcred, NULL);
181
			    NULL);
179
			break;
182
			break;
180
		default:
183
		default:
181
			zio->io_error = SET_ERROR(ENOTSUP);
184
			zio->io_error = SET_ERROR(ENOTSUP);
Lines 183-188 vdev_file_io_start(zio_t *zio) Link Here
183
186
184
		zio_interrupt(zio);
187
		zio_interrupt(zio);
185
		return (ZIO_PIPELINE_STOP);
188
		return (ZIO_PIPELINE_STOP);
189
	case ZIO_TYPE_FREE:
190
		zio->io_error = SET_ERROR(ENOTSUP);
191
		zio_interrupt(zio);
192
		return (ZIO_PIPELINE_STOP);
186
	}
193
	}
187
194
188
	zio->io_error = vn_rdwr(zio->io_type == ZIO_TYPE_READ ?
195
	zio->io_error = vn_rdwr(zio->io_type == ZIO_TYPE_READ ?

Return to bug 195061