diff options
| author | kmacy <kmacy@FreeBSD.org> | 2008-09-26 05:29:39 +0000 |
|---|---|---|
| committer | kmacy <kmacy@FreeBSD.org> | 2008-09-26 05:29:39 +0000 |
| commit | 3d2b6bb54b8a411bb970da8c076cad33f16eba7a (patch) | |
| tree | c6c485e78e0fbd30ce865ac6ee34c847120931a3 /sys/dev/xen/blkfront/blkfront.c | |
| parent | 966196697e0d67be61d85d4d9f9039a772c7cc2c (diff) | |
| download | FreeBSD-src-3d2b6bb54b8a411bb970da8c076cad33f16eba7a.zip FreeBSD-src-3d2b6bb54b8a411bb970da8c076cad33f16eba7a.tar.gz | |
Update xen/interface includes to the latest in mercurial
MFC after: 1 month
Diffstat (limited to 'sys/dev/xen/blkfront/blkfront.c')
| -rw-r--r-- | sys/dev/xen/blkfront/blkfront.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/dev/xen/blkfront/blkfront.c b/sys/dev/xen/blkfront/blkfront.c index 17202b1..3bdc4f8 100644 --- a/sys/dev/xen/blkfront/blkfront.c +++ b/sys/dev/xen/blkfront/blkfront.c @@ -411,6 +411,8 @@ static void backend_changed(struct xenbus_device *dev, case XenbusStateInitWait: case XenbusStateInitialised: case XenbusStateClosed: + case XenbusStateReconfigured: + case XenbusStateReconfiguring: break; case XenbusStateConnected: @@ -892,7 +894,7 @@ blkif_free(struct blkfront_info *info, int suspend) /* Free resources associated with old device channel. */ if (info->ring_ref != GRANT_INVALID_REF) { - gnttab_end_foreign_access(info->ring_ref, 0, + gnttab_end_foreign_access(info->ring_ref, info->ring.sring); info->ring_ref = GRANT_INVALID_REF; info->ring.sring = NULL; @@ -909,7 +911,7 @@ blkif_completion(struct blk_shadow *s) int i; for (i = 0; i < s->req.nr_segments; i++) - gnttab_end_foreign_access(s->req.seg[i].gref, 0, 0UL); + gnttab_end_foreign_access(s->req.seg[i].gref, 0UL); } static void |
