d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump disk(9) ABI version to signify the addition of d_delmaxsize by r249940.

Browse Source 
Ensure that d_delmaxsize is always set, removing init to 0 which could cause
future issues if use cases change.

Allow kern.cam.da.X.delete_max (which maps to d_delmaxsize) to be increased
up to the calculated max after being reduced.

MFC after:	1 day
X-MFC-With: r249940
This commit is contained in:
Steven Hartland 2013-07-03 23:46:30 +00:00
parent 6b5fbc1225
commit 8383a92e5b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=252657
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/cam/scsi/scsi_da.c
View File

@ -1746,7 +1746,7 @@ dadeletemaxsysctl(SYSCTL_HANDLER_ARGS)
return (error);
/* only accept values smaller than the calculated value */
if (value > softc->disk->d_delmaxsize) {
if (value > dadeletemaxsize(softc, softc->delete_method)) {
return (EINVAL);
}
softc->disk->d_delmaxsize = value;

14
sys/geom/geom_disk.c
View File

@ -148,14 +148,12 @@ g_disk_access(struct g_provider *pp, int r, int w, int e)
dp->d_name, dp->d_unit);
dp->d_maxsize = DFLTPHYS;
}
if (dp->d_flags & DISKFLAG_CANDELETE) {
if (bootverbose && dp->d_delmaxsize == 0) {
printf("WARNING: Disk drive %s%d has no d_delmaxsize\n",
dp->d_name, dp->d_unit);
dp->d_delmaxsize = dp->d_maxsize;
if (dp->d_delmaxsize == 0) {
if (bootverbose && dp->d_flags & DISKFLAG_CANDELETE) {
printf("WARNING: Disk drive %s%d has no "
"d_delmaxsize\n", dp->d_name, dp->d_unit);
}
} else {
dp->d_delmaxsize = 0;
dp->d_delmaxsize = dp->d_maxsize;
}
pp->stripeoffset = dp->d_stripeoffset;
pp->stripesize = dp->d_stripesize;
@ -629,7 +627,7 @@ void
disk_create(struct disk *dp, int version)
{
if (version != DISK_VERSION_02) {
if (version != DISK_VERSION) {
printf("WARNING: Attempt to add disk %s%d %s",
dp->d_name, dp->d_unit,
" using incompatible ABI version of disk(9)\n");

3
sys/geom/geom_disk.h
View File

@ -120,7 +120,8 @@ int disk_resize(struct disk *dp, int flag);
#define DISK_VERSION_00 0x58561059
#define DISK_VERSION_01 0x5856105a
#define DISK_VERSION_02 0x5856105b
#define DISK_VERSION DISK_VERSION_02
#define DISK_VERSION_03 0x5856105c
#define DISK_VERSION DISK_VERSION_03
#endif /* _KERNEL */
#endif /* _GEOM_GEOM_DISK_H_ */