upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Since vinum doesn't fake disklabels anymore, remove get_volume_label().

Browse source 
Also, remove stale write_volume_label() declaration; the write_volume_label()
function was deleted 8 months ago.

Approved by:    grog (mentor)
This commit is contained in:
Lukas Ertl 2004-03-09 09:50:15 +00:00
parent d56ed147ae
commit 664e22ad1e
2 changed files with 0 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/dev/vinum/vinumext.h
View file

@ -187,8 +187,6 @@ void forceup(int plexno);
void update_plex_state(int plexno);
void update_volume_state(int volno);
void invalidate_subdisks(struct plex *, enum sdstate);
void get_volume_label(char *name, int plexes, u_int64_t size, struct disklabel *lp);
int write_volume_label(int);
void start_object(struct vinum_ioctl_msg *);
void stop_object(struct vinum_ioctl_msg *);
void setstate(struct vinum_ioctl_msg *msg);

60
sys/dev/vinum/vinumio.c
View file

@ -626,66 +626,6 @@ daemon_save_config(void)
Free(config);
}
/*
* Disk labels are a mess. The correct way to
* access them is with the DIOC[GSW]DINFO ioctls,
* but some programs, such as newfs, access the
* disk directly, so we have to write things
* there. We do this only on request. If a user
* request tries to read it directly, we fake up
* one on the fly.
*/
/*
* get_volume_label returns a label structure to
* lp, which is allocated by the caller.
*/
void
get_volume_label(char *name, int plexes, u_int64_t size, struct disklabel *lp)
{
bzero(lp, sizeof(struct disklabel));
strncpy(lp->d_typename, "vinum", sizeof(lp->d_typename));
lp->d_type = DTYPE_VINUM;
strncpy(lp->d_packname, name, min(sizeof(lp->d_packname), sizeof(name)));
lp->d_rpm = 14400 * plexes; /* to keep them guessing */
lp->d_interleave = 1;
lp->d_flags = 0;
/*
* A Vinum volume has a single track with all
* its sectors.
*/
lp->d_secsize = DEV_BSIZE; /* bytes per sector */
lp->d_nsectors = size; /* data sectors per track */
lp->d_ntracks = 1; /* tracks per cylinder */
lp->d_ncylinders = 1; /* data cylinders per unit */
lp->d_secpercyl = size; /* data sectors per cylinder */
lp->d_secperunit = size; /* data sectors per unit */
lp->d_bbsize = BBSIZE;
lp->d_sbsize = 0; /* no longer used? */
lp->d_magic = DISKMAGIC;
lp->d_magic2 = DISKMAGIC;
/*
* Set up partitions a, b and c to be identical
* and the size of the volume. a is UFS, b is
* swap, c is nothing.
*/
lp->d_partitions[0].p_size = size;
lp->d_partitions[0].p_fsize = 1024;
lp->d_partitions[0].p_fstype = FS_BSDFFS; /* FreeBSD File System :-) */
lp->d_partitions[0].p_fsize = 1024; /* FS fragment size */
lp->d_partitions[0].p_frag = 8; /* and fragments per block */
lp->d_partitions[SWAP_PART].p_size = size;
lp->d_partitions[SWAP_PART].p_fstype = FS_SWAP; /* swap partition */
lp->d_partitions[LABEL_PART].p_size = size;
lp->d_npartitions = LABEL_PART + 1;
strncpy(lp->d_packname, name, min(sizeof(lp->d_packname), sizeof(name)));
lp->d_checksum = dkcksum(lp);
}
/*
* Search disks on system for vinum slices and add
* them to the configuuration if they're not