← Back to branch summary

~ubuntu-branches/debian/wheezy/zfsutils/wheezy

« back to all changes in this revision

Viewing changes to sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c

  • Committer: Package Import Robot
  • Author(s): Robert Millan, Robert Millan
  • Date: 2012-02-04 17:16:40 UTC
  • mfrom: (1.1.3)
  • Revision ID: package-import@ubuntu.com-20120204171640-zkmubmewnswspzku
Tags: 9.0-1
* New upstream release.

[ Robert Millan ]
* zfsutils.cron.daily: Fix to avoid listing children file systems'
  snapshots as candidates for removal.
* zfsutils.cron.daily: Remove verbose output.
* Remove X-Start-Before & X-Stop-After (no longer needed since ZVOL
  subsystem is not started by userland anymore).

Show diffs side-by-side

added added

removed removed

Lines of Context:
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c
153
153
vdev_file_io_start(zio_t *zio)
154
154
{
155
155
        vdev_t *vd = zio->io_vd;
156
 
        vdev_file_t *vf = vd->vdev_tsd;
157
 
        vnode_t *vp = vf->vf_vnode;
 
156
        vdev_file_t *vf;
 
157
        vnode_t *vp;
158
158
        ssize_t resid;
159
159
 
 
160
        if (!vdev_readable(vd)) {
 
161
                zio->io_error = ENXIO;
 
162
                return (ZIO_PIPELINE_CONTINUE);
 
163
        }
 
164
 
 
165
        vf = vd->vdev_tsd;
 
166
        vp = vf->vf_vnode;
 
167
 
160
168
        if (zio->io_type == ZIO_TYPE_IOCTL) {
161
 
                /* XXPOLICY */
162
 
                if (!vdev_readable(vd)) {
163
 
                        zio->io_error = ENXIO;
164
 
                        return (ZIO_PIPELINE_CONTINUE);
165
 
                }
166
 
 
167
169
                switch (zio->io_cmd) {
168
170
                case DKIOCFLUSHWRITECACHE:
169
171
                        zio->io_error = VOP_FSYNC(vp, FSYNC | FDSYNC,