Deleted Added
sdiff udiff text old ( 104451 ) new ( 104519 )
full compact
geom_disk.c (104451) geom_disk.c (104519)
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 104451 2002-10-04 10:15:26Z phk $
35 * $FreeBSD: head/sys/geom/geom_disk.c 104519 2002-10-05 16:35:33Z phk $
36 */
37
36 */
37
38#include "opt_geom.h"
39#ifndef NO_GEOM
40
38#include <sys/param.h>
39#include <sys/systm.h>
40#include <sys/kernel.h>
41#include <sys/sysctl.h>
42#include <sys/bio.h>
43#include <sys/conf.h>
44#include <sys/disk.h>
45#include <sys/diskslice.h>

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

258 g_orphan_provider(LIST_FIRST(&gp->provider), ENXIO);
259}
260
261void
262disk_invalidate (struct disk *disk)
263{
264}
265
41#include <sys/param.h>
42#include <sys/systm.h>
43#include <sys/kernel.h>
44#include <sys/sysctl.h>
45#include <sys/bio.h>
46#include <sys/conf.h>
47#include <sys/disk.h>
48#include <sys/diskslice.h>

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

261 g_orphan_provider(LIST_FIRST(&gp->provider), ENXIO);
262}
263
264void
265disk_invalidate (struct disk *disk)
266{
267}
268
266SYSCTL_INT(_debug_sizeof, OID_AUTO, disklabel, CTLFLAG_RD,
267 0, sizeof(struct disklabel), "sizeof(struct disklabel)");
268
269SYSCTL_INT(_debug_sizeof, OID_AUTO, diskslices, CTLFLAG_RD,
270 0, sizeof(struct diskslices), "sizeof(struct diskslices)");
271
272SYSCTL_INT(_debug_sizeof, OID_AUTO, disk, CTLFLAG_RD,
273 0, sizeof(struct disk), "sizeof(struct disk)");
274
275static void
276g_kern_disks(void *p)
277{
278 struct sbuf *sb;
279 struct g_geom *gp;
280 char *sp;
281
282 sb = p;

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

304 } while(!sbuf_done(sb));
305 error = SYSCTL_OUT(req, sbuf_data(sb), sbuf_len(sb));
306 sbuf_delete(sb);
307 return error;
308}
309
310SYSCTL_PROC(_kern, OID_AUTO, disks, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_NOLOCK, 0, 0,
311 sysctl_disks, "A", "names of available disks");
269static void
270g_kern_disks(void *p)
271{
272 struct sbuf *sb;
273 struct g_geom *gp;
274 char *sp;
275
276 sb = p;

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

298 } while(!sbuf_done(sb));
299 error = SYSCTL_OUT(req, sbuf_data(sb), sbuf_len(sb));
300 sbuf_delete(sb);
301 return error;
302}
303
304SYSCTL_PROC(_kern, OID_AUTO, disks, CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_NOLOCK, 0, 0,
305 sysctl_disks, "A", "names of available disks");
306
307#endif