Deleted Added
full compact
geom_disk.c (104542) geom_disk.c (104602)
1/*-
2 * Copyright (c) 2002 Poul-Henning Kamp
3 * Copyright (c) 2002 Networks Associates Technology, Inc.
4 * All rights reserved.
5 *
6 * This software was developed for the FreeBSD Project by Poul-Henning Kamp
7 * and NAI Labs, the Security Research Division of Network Associates, Inc.
8 * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the

--- 18 unchanged lines hidden (view full) ---

27 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 * SUCH DAMAGE.
34 *
1/*-
2 * Copyright (c) 2002 Poul-Henning Kamp
3 * Copyright (c) 2002 Networks Associates Technology, Inc.
4 * All rights reserved.
5 *
6 * This software was developed for the FreeBSD Project by Poul-Henning Kamp
7 * and NAI Labs, the Security Research Division of Network Associates, Inc.
8 * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the

--- 18 unchanged lines hidden (view full) ---

27 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 * SUCH DAMAGE.
34 *
35 * $FreeBSD: head/sys/geom/geom_disk.c 104542 2002-10-05 21:55:31Z phk $
35 * $FreeBSD: head/sys/geom/geom_disk.c 104602 2002-10-07 06:25:26Z phk $
36 */
37
38#include "opt_geom.h"
39#ifndef NO_GEOM
40
41#include <sys/param.h>
42#include <sys/systm.h>
43#include <sys/kernel.h>

--- 83 unchanged lines hidden (view full) ---

127
128 mtx_unlock(&Giant);
129 bp->bio_completed = bp->bio_length - bp->bio_resid;
130 g_std_done(bp);
131 mtx_lock(&Giant);
132}
133
134static void
36 */
37
38#include "opt_geom.h"
39#ifndef NO_GEOM
40
41#include <sys/param.h>
42#include <sys/systm.h>
43#include <sys/kernel.h>

--- 83 unchanged lines hidden (view full) ---

127
128 mtx_unlock(&Giant);
129 bp->bio_completed = bp->bio_length - bp->bio_resid;
130 g_std_done(bp);
131 mtx_lock(&Giant);
132}
133
134static void
135g_disk_ioctl(void *arg)
136{
137 struct bio *bp;
138 dev_t dev;
139 struct disk *dp;
140 struct g_ioctl *gio;
141 int error;
142
143 bp = arg;
144 dp = bp->bio_to->geom->softc;
145 dev = dp->d_dev;
146 gio = (struct g_ioctl *)bp->bio_data;
147 mtx_lock(&Giant);
148 error = devsw(dev)->d_ioctl(dev, gio->cmd,
149 gio->data, gio->fflag, gio->td);
150 mtx_unlock(&Giant);
151 g_io_deliver(bp, error);
152}
153
154static void
155g_disk_start(struct bio *bp)
156{
157 struct bio *bp2;
158 dev_t dev;
159 struct disk *dp;
160 struct g_ioctl *gio;
161 int error;
162

--- 23 unchanged lines hidden (view full) ---

186 else if (g_handleattr_off_t(bp, "GEOM::mediasize", dp->d_mediasize))
187 break;
188 else if (g_handleattr_off_t(bp, "GEOM::frontstuff", 0))
189 break;
190 else if (!strcmp(bp->bio_attribute, "GEOM::kerneldump"))
191 g_disk_kerneldump(bp, dp);
192 else if (!strcmp(bp->bio_attribute, "GEOM::ioctl") &&
193 bp->bio_length == sizeof *gio) {
135g_disk_start(struct bio *bp)
136{
137 struct bio *bp2;
138 dev_t dev;
139 struct disk *dp;
140 struct g_ioctl *gio;
141 int error;
142

--- 23 unchanged lines hidden (view full) ---

166 else if (g_handleattr_off_t(bp, "GEOM::mediasize", dp->d_mediasize))
167 break;
168 else if (g_handleattr_off_t(bp, "GEOM::frontstuff", 0))
169 break;
170 else if (!strcmp(bp->bio_attribute, "GEOM::kerneldump"))
171 g_disk_kerneldump(bp, dp);
172 else if (!strcmp(bp->bio_attribute, "GEOM::ioctl") &&
173 bp->bio_length == sizeof *gio) {
194 g_call_me(g_disk_ioctl, bp);
195 return;
174 gio = (struct g_ioctl *)bp->bio_data;
175 gio->func = devsw(dp->d_dev)->d_ioctl;
176 gio->dev = dp->d_dev;
177 error = EDIRIOCTL;
196 } else
197 error = ENOIOCTL;
198 break;
199 case BIO_SETATTR:
200 if (!strcmp(bp->bio_attribute, "GEOM::ioctl") &&
201 bp->bio_length == sizeof *gio) {
178 } else
179 error = ENOIOCTL;
180 break;
181 case BIO_SETATTR:
182 if (!strcmp(bp->bio_attribute, "GEOM::ioctl") &&
183 bp->bio_length == sizeof *gio) {
202 g_call_me(g_disk_ioctl, bp);
203 return;
184 gio = (struct g_ioctl *)bp->bio_data;
185 gio->func = devsw(dp->d_dev)->d_ioctl;
186 gio->dev = dp->d_dev;
187 error = EDIRIOCTL;
204 } else
205 error = ENOIOCTL;
206 break;
207 default:
208 error = EOPNOTSUPP;
209 break;
210 }
211 if (error) {

--- 104 unchanged lines hidden ---
188 } else
189 error = ENOIOCTL;
190 break;
191 default:
192 error = EOPNOTSUPP;
193 break;
194 }
195 if (error) {

--- 104 unchanged lines hidden ---