Revert r357710 and 357711 until they can be debugged
This commit is contained in:
parent
cd951a0d8e
commit
85eb41f751
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=357730
@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
|
||||
#include <sys/proc.h>
|
||||
#include <sys/reboot.h>
|
||||
#include <sys/sbuf.h>
|
||||
#include <geom/geom.h>
|
||||
#include <geom/geom_disk.h>
|
||||
#endif /* _KERNEL */
|
||||
|
||||
@ -1567,10 +1566,6 @@ adagetattr(struct bio *bp)
|
||||
int ret;
|
||||
struct cam_periph *periph;
|
||||
|
||||
/* TODO: tunable knob */
|
||||
if (g_handleattr_int(bp, "GEOM::canspeedup", 1))
|
||||
return (0);
|
||||
|
||||
periph = (struct cam_periph *)bp->bio_disk->d_drv1;
|
||||
cam_periph_lock(periph);
|
||||
ret = xpt_getattr(bp->bio_data, bp->bio_length, bp->bio_attribute,
|
||||
|
@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$");
|
||||
#include <sys/cons.h>
|
||||
#include <sys/proc.h>
|
||||
#include <sys/reboot.h>
|
||||
#include <geom/geom.h>
|
||||
#include <geom/geom_disk.h>
|
||||
#endif /* _KERNEL */
|
||||
|
||||
@ -701,10 +700,6 @@ ndagetattr(struct bio *bp)
|
||||
int ret;
|
||||
struct cam_periph *periph;
|
||||
|
||||
/* TODO: tunable knob */
|
||||
if (g_handleattr_int(bp, "GEOM::canspeedup", 1))
|
||||
return (0);
|
||||
|
||||
periph = (struct cam_periph *)bp->bio_disk->d_drv1;
|
||||
cam_periph_lock(periph);
|
||||
ret = xpt_getattr(bp->bio_data, bp->bio_length, bp->bio_attribute,
|
||||
|
@ -1942,10 +1942,6 @@ dagetattr(struct bio *bp)
|
||||
int ret;
|
||||
struct cam_periph *periph;
|
||||
|
||||
/* TODO: tunable knob for this */
|
||||
if (g_handleattr_int(bp, "GEOM::canspeedup", 1))
|
||||
return (0);
|
||||
|
||||
periph = (struct cam_periph *)bp->bio_disk->d_drv1;
|
||||
cam_periph_lock(periph);
|
||||
ret = xpt_getattr(bp->bio_data, bp->bio_length, bp->bio_attribute,
|
||||
|
@ -1464,9 +1464,6 @@ softdep_send_speedup(struct ufsmount *ump, size_t shortage, u_int flags)
|
||||
{
|
||||
struct buf *bp;
|
||||
|
||||
if ((ump->um_flags & UM_CANSPEEDUP) == 0)
|
||||
return;
|
||||
|
||||
bp = malloc(sizeof(*bp), M_TRIM, M_WAITOK | M_ZERO);
|
||||
bp->b_iocmd = BIO_SPEEDUP;
|
||||
bp->b_ioflags = flags;
|
||||
|
@ -794,7 +794,7 @@ ffs_mountfs(devvp, mp, td)
|
||||
struct ucred *cred;
|
||||
struct g_consumer *cp;
|
||||
struct mount *nmp;
|
||||
int candelete, canspeedup;
|
||||
int candelete;
|
||||
off_t loc;
|
||||
|
||||
fs = NULL;
|
||||
@ -1011,13 +1011,6 @@ ffs_mountfs(devvp, mp, td)
|
||||
}
|
||||
}
|
||||
|
||||
/* TODO: sysctl tunables, runtime modification */
|
||||
len = sizeof(int);
|
||||
if (g_io_getattr("GEOM::canspeedup", cp, &len, &canspeedup) == 0) {
|
||||
if (canspeedup)
|
||||
ump->um_flags |= UM_CANSPEEDUP;
|
||||
}
|
||||
|
||||
ump->um_mountp = mp;
|
||||
ump->um_dev = dev;
|
||||
ump->um_devvp = devvp;
|
||||
|
@ -131,7 +131,6 @@ struct ufsmount {
|
||||
*/
|
||||
#define UM_CANDELETE 0x00000001 /* devvp supports TRIM */
|
||||
#define UM_WRITESUSPENDED 0x00000002 /* suspension in progress */
|
||||
#define UM_CANSPEEDUP 0x00000004 /* devvp supports SPEEDUP */
|
||||
|
||||
/*
|
||||
* function prototypes
|
||||
|
Loading…
Reference in New Issue
Block a user