Date: Tue, 7 Feb 2017 01:13:50 +0000 From: Steven Hartland <steven.hartland@multiplay.co.uk> To: Toomas Soome <tsoome@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: Re: svn commit: r313355 - in stable/11: lib/libstand sys/boot/common sys/boot/efi/libefi sys/boot/i386/libfirewire sys/boot/i386/libi386 sys/boot/mips/beri/loader sys/boot/ofw/libofw sys/boot/pc98/libp... Message-ID: <7039cd35-17ea-e811-4eb4-cc51ca24e120@multiplay.co.uk> In-Reply-To: <201702062203.v16M37hK098561@repo.freebsd.org> References: <201702062203.v16M37hK098561@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
IMO combining fixes from different areas (yes mainly libstand but dosfs and nandfs) and with style cleanups is not ideal as it makes it much harder to find and identify problems. I appreciate these have been in head for a while but its not unheard of to only identify issues once they are MFC'ed, so keeping the separation is better. You also missed the description from the 3rd commit e.g. loader: nandfs calls strategy with one extra argument. Finally keep the "r" prefix when mentioning the revisions being MFC'ed as that ensure they linked in svnweb properly e.g. MFC r309369, r310850, r310853: On 06/02/2017 22:03, Toomas Soome wrote: > Author: tsoome > Date: Mon Feb 6 22:03:07 2017 > New Revision: 313355 > URL: https://svnweb.freebsd.org/changeset/base/313355 > > Log: > MFC r309369,310850,310853: > > libstand: dosfs cstyle cleanup for return keyword. > dosfs support in libstand is broken since r298230 > > PR: 214423 > Submitted by: Mikhail Kupchik > Reported by: Mikhail Kupchik > Approved by: imp (mentor) > > Modified: > stable/11/lib/libstand/cd9660.c > stable/11/lib/libstand/dosfs.c > stable/11/lib/libstand/ext2fs.c > stable/11/lib/libstand/nandfs.c > stable/11/lib/libstand/read.c > stable/11/lib/libstand/stand.h > stable/11/lib/libstand/ufs.c > stable/11/lib/libstand/write.c > stable/11/sys/boot/common/bcache.c > stable/11/sys/boot/common/bootstrap.h > stable/11/sys/boot/common/disk.c > stable/11/sys/boot/common/md.c > stable/11/sys/boot/efi/libefi/efipart.c > stable/11/sys/boot/i386/libfirewire/firewire.c > stable/11/sys/boot/i386/libi386/bioscd.c > stable/11/sys/boot/i386/libi386/biosdisk.c > stable/11/sys/boot/i386/libi386/pxe.c > stable/11/sys/boot/mips/beri/loader/beri_disk_cfi.c > stable/11/sys/boot/mips/beri/loader/beri_disk_sdcard.c > stable/11/sys/boot/ofw/libofw/ofw_disk.c > stable/11/sys/boot/pc98/libpc98/bioscd.c > stable/11/sys/boot/pc98/libpc98/biosdisk.c > stable/11/sys/boot/powerpc/kboot/hostdisk.c > stable/11/sys/boot/powerpc/ps3/ps3cdrom.c > stable/11/sys/boot/powerpc/ps3/ps3disk.c > stable/11/sys/boot/uboot/lib/disk.c > stable/11/sys/boot/usb/storage/umass_loader.c > stable/11/sys/boot/userboot/userboot/host.c > stable/11/sys/boot/userboot/userboot/userboot_disk.c > stable/11/sys/boot/zfs/zfs.c > Directory Properties: > stable/11/ (props changed) > > Modified: stable/11/lib/libstand/cd9660.c > ============================================================================== > --- stable/11/lib/libstand/cd9660.c Mon Feb 6 21:02:26 2017 (r313354) > +++ stable/11/lib/libstand/cd9660.c Mon Feb 6 22:03:07 2017 (r313355) > @@ -143,7 +143,7 @@ susp_lookup_record(struct open_file *f, > if (bcmp(sh->type, SUSP_CONTINUATION, 2) == 0) { > shc = (ISO_RRIP_CONT *)sh; > error = f->f_dev->dv_strategy(f->f_devdata, F_READ, > - cdb2devb(isonum_733(shc->location)), 0, > + cdb2devb(isonum_733(shc->location)), > ISO_DEFAULT_BLOCK_SIZE, susp_buffer, &read); > > /* Bail if it fails. */ > @@ -288,7 +288,7 @@ cd9660_open(const char *path, struct ope > for (bno = 16;; bno++) { > twiddle(1); > rc = f->f_dev->dv_strategy(f->f_devdata, F_READ, cdb2devb(bno), > - 0, ISO_DEFAULT_BLOCK_SIZE, buf, &read); > + ISO_DEFAULT_BLOCK_SIZE, buf, &read); > if (rc) > goto out; > if (read != ISO_DEFAULT_BLOCK_SIZE) { > @@ -322,7 +322,7 @@ cd9660_open(const char *path, struct ope > twiddle(1); > rc = f->f_dev->dv_strategy > (f->f_devdata, F_READ, > - cdb2devb(bno + boff), 0, > + cdb2devb(bno + boff), > ISO_DEFAULT_BLOCK_SIZE, > buf, &read); > if (rc) > @@ -381,7 +381,7 @@ cd9660_open(const char *path, struct ope > bno = isonum_733(rec.extent) + isonum_711(rec.ext_attr_length); > twiddle(1); > rc = f->f_dev->dv_strategy(f->f_devdata, F_READ, cdb2devb(bno), > - 0, ISO_DEFAULT_BLOCK_SIZE, buf, &read); > + ISO_DEFAULT_BLOCK_SIZE, buf, &read); > if (rc) > goto out; > if (read != ISO_DEFAULT_BLOCK_SIZE) { > @@ -438,7 +438,7 @@ buf_read_file(struct open_file *f, char > > twiddle(16); > rc = f->f_dev->dv_strategy(f->f_devdata, F_READ, > - cdb2devb(blkno), 0, ISO_DEFAULT_BLOCK_SIZE, > + cdb2devb(blkno), ISO_DEFAULT_BLOCK_SIZE, > fp->f_buf, &read); > if (rc) > return (rc); > > Modified: stable/11/lib/libstand/dosfs.c > ============================================================================== > --- stable/11/lib/libstand/dosfs.c Mon Feb 6 21:02:26 2017 (r313354) > +++ stable/11/lib/libstand/dosfs.c Mon Feb 6 22:03:07 2017 (r313355) > @@ -154,7 +154,7 @@ static int fatcnt(DOS_FS *, u_int); > static int fatget(DOS_FS *, u_int *); > static int fatend(u_int, u_int); > static int ioread(DOS_FS *, u_int, void *, u_int); > -static int ioget(struct open_file *, daddr_t, size_t, void *, u_int); > +static int ioget(struct open_file *, daddr_t, void *, u_int); > > static void > dos_read_fat(DOS_FS *fs, struct open_file *fd) > @@ -172,7 +172,7 @@ dos_read_fat(DOS_FS *fs, struct open_fil > fat.buf = malloc(secbyt(fs->spf)); > > if (fat.buf != NULL) { > - if (ioget(fd, fs->lsnfat, 0, fat.buf, secbyt(fs->spf)) == 0) { > + if (ioget(fd, fs->lsnfat, fat.buf, secbyt(fs->spf)) == 0) { > fat.size = fs->spf; > fat.unit = dd->d_unit; > return; > @@ -199,12 +199,12 @@ dos_mount(DOS_FS *fs, struct open_file * > fs->fd = fd; > > if ((err = !(buf = malloc(secbyt(1))) ? errno : 0) || > - (err = ioget(fs->fd, 0, 0, buf, secbyt(1))) || > + (err = ioget(fs->fd, 0, buf, secbyt(1))) || > (err = parsebs(fs, (DOS_BS *)buf))) { > if (buf != NULL) > free(buf); > (void)dosunmount(fs); > - return(err); > + return (err); > } > free(buf); > > @@ -219,7 +219,7 @@ dos_mount(DOS_FS *fs, struct open_file * > fs->root.dex.h_clus[0] = (fs->rdcl >> 16) & 0xff; > fs->root.dex.h_clus[1] = (fs->rdcl >> 24) & 0xff; > } > - return 0; > + return (0); > } > > /* > @@ -231,10 +231,10 @@ dos_unmount(DOS_FS *fs) > int err; > > if (fs->links) > - return(EBUSY); > + return (EBUSY); > if ((err = dosunmount(fs))) > - return(err); > - return 0; > + return (err); > + return (0); > } > > /* > @@ -244,7 +244,7 @@ static int > dosunmount(DOS_FS *fs) > { > free(fs); > - return(0); > + return (0); > } > > /* > @@ -285,7 +285,7 @@ dos_open(const char *path, struct open_f > fd->f_fsdata = (void *)f; > > out: > - return(err); > + return (err); > } > > /* > @@ -307,7 +307,7 @@ dos_read(struct open_file *fd, void *buf > twiddle(4); > nb = (u_int)nbyte; > if ((size = fsize(f->fs, &f->de)) == -1) > - return EINVAL; > + return (EINVAL); > if (nb > (n = size - f->offset)) > nb = n; > off = f->offset; > @@ -344,7 +344,7 @@ dos_read(struct open_file *fd, void *buf > out: > if (resid) > *resid = nbyte - nb + cnt; > - return(err); > + return (err); > } > > /* > @@ -370,16 +370,16 @@ dos_seek(struct open_file *fd, off_t off > break; > default: > errno = EINVAL; > - return(-1); > + return (-1); > } > off += offset; > if (off < 0 || off > size) { > errno = EINVAL; > - return(-1); > + return (-1); > } > f->offset = (u_int)off; > f->c = 0; > - return(off); > + return (off); > } > > /* > @@ -394,7 +394,7 @@ dos_close(struct open_file *fd) > f->fs->links--; > free(f); > dos_unmount(fs); > - return 0; > + return (0); > } > > /* > @@ -411,7 +411,7 @@ dos_stat(struct open_file *fd, struct st > sb->st_uid = 0; > sb->st_gid = 0; > if ((sb->st_size = fsize(f->fs, &f->de)) == -1) > - return EINVAL; > + return (EINVAL); > return (0); > } > > @@ -501,7 +501,7 @@ dos_readdir(struct open_file *fd, struct > d->d_reclen = sizeof(*d); > d->d_type = (dd.de.attr & FA_DIR) ? DT_DIR : DT_REG; > memcpy(d->d_name, fn, sizeof(d->d_name)); > - return(0); > + return (0); > } > > /* > @@ -516,41 +516,41 @@ parsebs(DOS_FS *fs, DOS_BS *bs) > bs->jmp[0] != 0xe9 && > (bs->jmp[0] != 0xeb || bs->jmp[2] != 0x90)) || > bs->bpb.media < 0xf0) > - return EINVAL; > + return (EINVAL); > if (cv2(bs->bpb.secsiz) != SECSIZ) > - return EINVAL; > + return (EINVAL); > if (!(fs->spc = bs->bpb.spc) || fs->spc & (fs->spc - 1)) > - return EINVAL; > + return (EINVAL); > fs->bsize = secbyt(fs->spc); > fs->bshift = ffs(fs->bsize) - 1; > if ((fs->spf = cv2(bs->bpb.spf))) { > if (bs->bpb.fats != 2) > - return EINVAL; > + return (EINVAL); > if (!(fs->dirents = cv2(bs->bpb.dirents))) > - return EINVAL; > + return (EINVAL); > } else { > if (!(fs->spf = cv4(bs->bpb.lspf))) > - return EINVAL; > + return (EINVAL); > if (!bs->bpb.fats || bs->bpb.fats > 16) > - return EINVAL; > + return (EINVAL); > if ((fs->rdcl = cv4(bs->bpb.rdcl)) < LOCLUS) > - return EINVAL; > + return (EINVAL); > } > if (!(fs->lsnfat = cv2(bs->bpb.ressec))) > - return EINVAL; > + return (EINVAL); > fs->lsndir = fs->lsnfat + fs->spf * bs->bpb.fats; > fs->lsndta = fs->lsndir + entsec(fs->dirents); > if (!(sc = cv2(bs->bpb.secs)) && !(sc = cv4(bs->bpb.lsecs))) > - return EINVAL; > + return (EINVAL); > if (fs->lsndta > sc) > - return EINVAL; > + return (EINVAL); > if ((fs->xclus = secblk(fs, sc - fs->lsndta) + 1) < LOCLUS) > - return EINVAL; > + return (EINVAL); > fs->fatsz = fs->dirents ? fs->xclus < 0xff6 ? 12 : 16 : 32; > sc = (secbyt(fs->spf) << 1) / (fs->fatsz >> 2) - 1; > if (fs->xclus > sc) > fs->xclus = sc; > - return 0; > + return (0); > } > > /* > @@ -575,17 +575,17 @@ namede(DOS_FS *fs, const char *path, DOS > if (!(s = strchr(path, '/'))) > s = strchr(path, 0); > if ((n = s - path) > 255) > - return ENAMETOOLONG; > + return (ENAMETOOLONG); > memcpy(name, path, n); > name[n] = 0; > path = s; > if (!(de->attr & FA_DIR)) > - return ENOTDIR; > + return (ENOTDIR); > if ((err = lookup(fs, stclus(fs->fatsz, de), name, &de))) > - return err; > + return (err); > } > *dep = de; > - return 0; > + return (0); > } > > /* > @@ -604,7 +604,7 @@ lookup(DOS_FS *fs, u_int clus, const cha > for (ent = 0; ent < 2; ent++) > if (!strcasecmp(name, dotstr[ent])) { > *dep = dot + ent; > - return 0; > + return (0); > } > if (!clus && fs->fatsz == 32) > clus = fs->rdcl; > @@ -617,13 +617,13 @@ lookup(DOS_FS *fs, u_int clus, const cha > else if (okclus(fs, clus)) > lsec = blklsn(fs, clus); > else > - return EINVAL; > + return (EINVAL); > for (sec = 0; sec < nsec; sec++) { > - if ((err = ioget(fs->fd, lsec + sec, 0, dir, secbyt(1)))) > - return err; > + if ((err = ioget(fs->fd, lsec + sec, dir, secbyt(1)))) > + return (err); > for (ent = 0; ent < DEPSEC; ent++) { > if (!*dir[ent].de.name) > - return ENOENT; > + return (ENOENT); > if (*dir[ent].de.name != 0xe5) { > if ((dir[ent].de.attr & FA_MASK) == FA_XDE) { > x = dir[ent].xde.seq; > @@ -651,7 +651,7 @@ lookup(DOS_FS *fs, u_int clus, const cha > } > if (ok) { > *dep = &dir[ent].de; > - return 0; > + return (0); > } > } > } > @@ -661,11 +661,11 @@ lookup(DOS_FS *fs, u_int clus, const cha > if (!clus) > break; > if ((err = fatget(fs, &clus))) > - return err; > + return (err); > if (fatend(fs->fatsz, clus)) > break; > } > - return ENOENT; > + return (ENOENT); > } > > /* > @@ -739,11 +739,11 @@ fsize(DOS_FS *fs, DOS_DE *de) > size = fs->dirents * sizeof(DOS_DE); > else { > if ((n = fatcnt(fs, c)) == -1) > - return n; > + return (n); > size = blkbyt(fs, n); > } > } > - return size; > + return (size); > } > > /* > @@ -756,8 +756,8 @@ fatcnt(DOS_FS *fs, u_int c) > > for (n = 0; okclus(fs, c); n++) > if (fatget(fs, &c)) > - return -1; > - return fatend(fs->fatsz, c) ? n : -1; > + return (-1); > + return (fatend(fs->fatsz, c) ? n : -1); > } > > /* > @@ -768,8 +768,7 @@ static int > fatget(DOS_FS *fs, u_int *c) > { > u_char buf[4]; > - u_char *s; > - u_int x, offset, off, n, nbyte, lsec; > + u_int x, offset, n, nbyte; > struct devdesc *dd = fs->fd->f_devdata; > int err = 0; > > @@ -783,25 +782,9 @@ fatget(DOS_FS *fs, u_int *c) > offset = fatoff(fs->fatsz, *c); > nbyte = fs->fatsz != 32 ? 2 : 4; > > - s = buf; > - if ((off = offset & (SECSIZ - 1))) { > - offset -= off; > - lsec = bytsec(offset); > - offset += SECSIZ; > - if ((n = SECSIZ - off) > nbyte) > - n = nbyte; > - memcpy(s, fat.buf + secbyt(lsec) + off, n); > - s += n; > - nbyte -= n; > - } > - n = nbyte & (SECSIZ - 1); > - if (nbyte -= n) { > - memcpy(s, fat.buf + secbyt(bytsec(offset)), nbyte); > - offset += nbyte; > - s += nbyte; > - } > - if (n) > - memcpy(s, fat.buf + secbyt(bytsec(offset)), n); > + if (offset + nbyte > secbyt(fat.size)) > + return (EINVAL); > + memcpy(buf, fat.buf + offset, nbyte); > } > > x = fs->fatsz != 32 ? cv2(buf) : cv4(buf); > @@ -815,7 +798,7 @@ fatget(DOS_FS *fs, u_int *c) > static int > fatend(u_int sz, u_int c) > { > - return c > (sz == 12 ? 0xff7U : sz == 16 ? 0xfff7U : 0xffffff7); > + return (c > (sz == 12 ? 0xff7U : sz == 16 ? 0xfff7U : 0xffffff7)); > } > > /* > @@ -827,38 +810,41 @@ ioread(DOS_FS *fs, u_int offset, void *b > char *s; > u_int off, n; > int err; > + u_char local_buf[SECSIZ]; > > s = buf; > if ((off = offset & (SECSIZ - 1))) { > offset -= off; > if ((n = SECSIZ - off) > nbyte) > n = nbyte; > - if ((err = ioget(fs->fd, bytsec(offset), off, s, n))) > - return err; > + if ((err = ioget(fs->fd, bytsec(offset), local_buf, sizeof(local_buf)))) > + return (err); > + memcpy(s, local_buf + off, n); > offset += SECSIZ; > s += n; > nbyte -= n; > } > n = nbyte & (SECSIZ - 1); > if (nbyte -= n) { > - if ((err = ioget(fs->fd, bytsec(offset), 0, s, nbyte))) > - return err; > + if ((err = ioget(fs->fd, bytsec(offset), s, nbyte))) > + return (err); > offset += nbyte; > s += nbyte; > } > if (n) { > - if ((err = ioget(fs->fd, bytsec(offset), 0, s, n))) > - return err; > + if ((err = ioget(fs->fd, bytsec(offset), local_buf, sizeof(local_buf)))) > + return (err); > + memcpy(s, local_buf, n); > } > - return 0; > + return (0); > } > > /* > * Sector-based I/O primitive > */ > static int > -ioget(struct open_file *fd, daddr_t lsec, size_t offset, void *buf, u_int size) > +ioget(struct open_file *fd, daddr_t lsec, void *buf, u_int size) > { > - return ((fd->f_dev->dv_strategy)(fd->f_devdata, F_READ, lsec, offset, > + return ((fd->f_dev->dv_strategy)(fd->f_devdata, F_READ, lsec, > size, buf, NULL)); > } > > Modified: stable/11/lib/libstand/ext2fs.c > ============================================================================== > --- stable/11/lib/libstand/ext2fs.c Mon Feb 6 21:02:26 2017 (r313354) > +++ stable/11/lib/libstand/ext2fs.c Mon Feb 6 22:03:07 2017 (r313355) > @@ -355,7 +355,7 @@ ext2fs_open(const char *upath, struct op > fp->f_fs = fs; > twiddle(1); > error = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, > - EXT2_SBLOCK, 0, EXT2_SBSIZE, (char *)fs, &buf_size); > + EXT2_SBLOCK, EXT2_SBSIZE, (char *)fs, &buf_size); > if (error) > goto out; > > @@ -397,7 +397,7 @@ ext2fs_open(const char *upath, struct op > fp->f_bg = malloc(len); > twiddle(1); > error = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, > - EXT2_SBLOCK + EXT2_SBSIZE / DEV_BSIZE, 0, len, > + EXT2_SBLOCK + EXT2_SBSIZE / DEV_BSIZE, len, > (char *)fp->f_bg, &buf_size); > if (error) > goto out; > @@ -509,7 +509,7 @@ ext2fs_open(const char *upath, struct op > > twiddle(1); > error = (f->f_dev->dv_strategy)(f->f_devdata, > - F_READ, fsb_to_db(fs, disk_block), 0, > + F_READ, fsb_to_db(fs, disk_block), > fs->fs_bsize, buf, &buf_size); > if (error) > goto out; > @@ -570,7 +570,7 @@ read_inode(ino_t inumber, struct open_fi > buf = malloc(fs->fs_bsize); > twiddle(1); > error = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, > - ino_to_db(fs, fp->f_bg, inumber), 0, fs->fs_bsize, buf, &rsize); > + ino_to_db(fs, fp->f_bg, inumber), fs->fs_bsize, buf, &rsize); > if (error) > goto out; > if (rsize != fs->fs_bsize) { > @@ -667,7 +667,7 @@ block_map(struct open_file *f, daddr_t f > malloc(fs->fs_bsize); > twiddle(1); > error = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, > - fsb_to_db(fp->f_fs, ind_block_num), 0, fs->fs_bsize, > + fsb_to_db(fp->f_fs, ind_block_num), fs->fs_bsize, > fp->f_blk[level], &fp->f_blksize[level]); > if (error) > return (error); > @@ -725,7 +725,7 @@ buf_read_file(struct open_file *f, char > } else { > twiddle(4); > error = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, > - fsb_to_db(fs, disk_block), 0, block_size, > + fsb_to_db(fs, disk_block), block_size, > fp->f_buf, &fp->f_buf_size); > if (error) > goto done; > > Modified: stable/11/lib/libstand/nandfs.c > ============================================================================== > --- stable/11/lib/libstand/nandfs.c Mon Feb 6 21:02:26 2017 (r313354) > +++ stable/11/lib/libstand/nandfs.c Mon Feb 6 22:03:07 2017 (r313355) > @@ -1024,7 +1024,7 @@ ioread(struct open_file *f, off_t pos, v > > buffer = malloc(nsec * bsize); > > - err = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, pos, 0, > + err = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, pos, > nsec * bsize, buffer, NULL); > > memcpy(buf, (void *)((uintptr_t)buffer + off), length); > @@ -1045,7 +1045,7 @@ nandfs_probe_sectorsize(struct open_file > > for (i = 512; i < (16 * 1024); i <<= 1) { > NANDFS_DEBUG("%d ", i); > - err = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, 0, 0, i, > + err = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, 0, i, > buffer, NULL); > > if (err == 0) { > > Modified: stable/11/lib/libstand/read.c > ============================================================================== > --- stable/11/lib/libstand/read.c Mon Feb 6 21:02:26 2017 (r313354) > +++ stable/11/lib/libstand/read.c Mon Feb 6 22:03:07 2017 (r313355) > @@ -79,7 +79,7 @@ read(int fd, void *dest, size_t bcount) > if (f->f_flags & F_RAW) { > twiddle(4); > errno = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, > - btodb(f->f_offset), 0, bcount, dest, &resid); > + btodb(f->f_offset), bcount, dest, &resid); > if (errno) > return (-1); > f->f_offset += resid; > > Modified: stable/11/lib/libstand/stand.h > ============================================================================== > --- stable/11/lib/libstand/stand.h Mon Feb 6 21:02:26 2017 (r313354) > +++ stable/11/lib/libstand/stand.h Mon Feb 6 22:03:07 2017 (r313355) > @@ -139,7 +139,7 @@ struct devsw { > int dv_type; /* opaque type constant, arch-dependant */ > int (*dv_init)(void); /* early probe call */ > int (*dv_strategy)(void *devdata, int rw, daddr_t blk, > - size_t offset, size_t size, char *buf, size_t *rsize); > + size_t size, char *buf, size_t *rsize); > int (*dv_open)(struct open_file *f, ...); > int (*dv_close)(struct open_file *f); > int (*dv_ioctl)(struct open_file *f, u_long cmd, void *data); > > Modified: stable/11/lib/libstand/ufs.c > ============================================================================== > --- stable/11/lib/libstand/ufs.c Mon Feb 6 21:02:26 2017 (r313354) > +++ stable/11/lib/libstand/ufs.c Mon Feb 6 22:03:07 2017 (r313355) > @@ -157,7 +157,7 @@ read_inode(inumber, f) > buf = malloc(fs->fs_bsize); > twiddle(1); > rc = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, > - fsbtodb(fs, ino_to_fsba(fs, inumber)), 0, fs->fs_bsize, > + fsbtodb(fs, ino_to_fsba(fs, inumber)), fs->fs_bsize, > buf, &rsize); > if (rc) > goto out; > @@ -267,7 +267,7 @@ block_map(f, file_block, disk_block_p) > malloc(fs->fs_bsize); > twiddle(1); > rc = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, > - fsbtodb(fp->f_fs, ind_block_num), 0, > + fsbtodb(fp->f_fs, ind_block_num), > fs->fs_bsize, > fp->f_blk[level], > &fp->f_blksize[level]); > @@ -348,7 +348,7 @@ buf_write_file(f, buf_p, size_p) > > twiddle(4); > rc = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, > - fsbtodb(fs, disk_block), 0, > + fsbtodb(fs, disk_block), > block_size, fp->f_buf, &fp->f_buf_size); > if (rc) > return (rc); > @@ -367,7 +367,7 @@ buf_write_file(f, buf_p, size_p) > > twiddle(4); > rc = (f->f_dev->dv_strategy)(f->f_devdata, F_WRITE, > - fsbtodb(fs, disk_block), 0, > + fsbtodb(fs, disk_block), > block_size, fp->f_buf, &fp->f_buf_size); > return (rc); > } > @@ -408,7 +408,7 @@ buf_read_file(f, buf_p, size_p) > } else { > twiddle(4); > rc = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, > - fsbtodb(fs, disk_block), 0, > + fsbtodb(fs, disk_block), > block_size, fp->f_buf, &fp->f_buf_size); > if (rc) > return (rc); > @@ -521,7 +521,7 @@ ufs_open(upath, f) > */ > for (i = 0; sblock_try[i] != -1; i++) { > rc = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, > - sblock_try[i] / DEV_BSIZE, 0, SBLOCKSIZE, > + sblock_try[i] / DEV_BSIZE, SBLOCKSIZE, > (char *)fs, &buf_size); > if (rc) > goto out; > @@ -651,7 +651,7 @@ ufs_open(upath, f) > > twiddle(1); > rc = (f->f_dev->dv_strategy)(f->f_devdata, > - F_READ, fsbtodb(fs, disk_block), 0, > + F_READ, fsbtodb(fs, disk_block), > fs->fs_bsize, buf, &buf_size); > if (rc) > goto out; > > Modified: stable/11/lib/libstand/write.c > ============================================================================== > --- stable/11/lib/libstand/write.c Mon Feb 6 21:02:26 2017 (r313354) > +++ stable/11/lib/libstand/write.c Mon Feb 6 22:03:07 2017 (r313355) > @@ -82,7 +82,7 @@ write(fd, dest, bcount) > if (f->f_flags & F_RAW) { > twiddle(4); > errno = (f->f_dev->dv_strategy)(f->f_devdata, F_WRITE, > - btodb(f->f_offset), 0, bcount, dest, &resid); > + btodb(f->f_offset), bcount, dest, &resid); > if (errno) > return (-1); > f->f_offset += resid; > > Modified: stable/11/sys/boot/common/bcache.c > ============================================================================== > --- stable/11/sys/boot/common/bcache.c Mon Feb 6 21:02:26 2017 (r313354) > +++ stable/11/sys/boot/common/bcache.c Mon Feb 6 22:03:07 2017 (r313355) > @@ -182,8 +182,8 @@ bcache_free(void *cache) > * cache with the new values. > */ > static int > -write_strategy(void *devdata, int rw, daddr_t blk, size_t offset, > - size_t size, char *buf, size_t *rsize) > +write_strategy(void *devdata, int rw, daddr_t blk, size_t size, > + char *buf, size_t *rsize) > { > struct bcache_devdata *dd = (struct bcache_devdata *)devdata; > struct bcache *bc = dd->dv_cache; > @@ -197,7 +197,7 @@ write_strategy(void *devdata, int rw, da > } > > /* Write the blocks */ > - return (dd->dv_strategy(dd->dv_devdata, rw, blk, offset, size, buf, rsize)); > + return (dd->dv_strategy(dd->dv_devdata, rw, blk, size, buf, rsize)); > } > > /* > @@ -206,8 +206,8 @@ write_strategy(void *devdata, int rw, da > * device I/O and then use the I/O results to populate the cache. > */ > static int > -read_strategy(void *devdata, int rw, daddr_t blk, size_t offset, > - size_t size, char *buf, size_t *rsize) > +read_strategy(void *devdata, int rw, daddr_t blk, size_t size, > + char *buf, size_t *rsize) > { > struct bcache_devdata *dd = (struct bcache_devdata *)devdata; > struct bcache *bc = dd->dv_cache; > @@ -225,7 +225,7 @@ read_strategy(void *devdata, int rw, dad > *rsize = 0; > > nblk = size / bcache_blksize; > - if ((nblk == 0 && size != 0) || offset != 0) > + if (nblk == 0 && size != 0) > nblk++; > result = 0; > complete = 1; > @@ -246,8 +246,7 @@ read_strategy(void *devdata, int rw, dad > if (complete) { /* whole set was in cache, return it */ > if (bc->ra < BCACHE_READAHEAD) > bc->ra <<= 1; /* increase read ahead */ > - bcopy(bc->bcache_data + (bcache_blksize * BHASH(bc, blk)) + offset, > - buf, size); > + bcopy(bc->bcache_data + (bcache_blksize * BHASH(bc, blk)), buf, size); > goto done; > } > > @@ -282,7 +281,7 @@ read_strategy(void *devdata, int rw, dad > * in either case we should return the data in bcache and only > * return error if there is no data. > */ > - result = dd->dv_strategy(dd->dv_devdata, rw, p_blk, 0, > + result = dd->dv_strategy(dd->dv_devdata, rw, p_blk, > p_size * bcache_blksize, p_buf, &r_size); > > r_size /= bcache_blksize; > @@ -305,8 +304,7 @@ read_strategy(void *devdata, int rw, dad > > size = i * bcache_blksize; > if (size != 0) { > - bcopy(bc->bcache_data + (bcache_blksize * BHASH(bc, blk)) + offset, > - buf, size); > + bcopy(bc->bcache_data + (bcache_blksize * BHASH(bc, blk)), buf, size); > result = 0; > } > > @@ -321,8 +319,8 @@ read_strategy(void *devdata, int rw, dad > * directly to the disk. XXX tune this. > */ > int > -bcache_strategy(void *devdata, int rw, daddr_t blk, size_t offset, > - size_t size, char *buf, size_t *rsize) > +bcache_strategy(void *devdata, int rw, daddr_t blk, size_t size, > + char *buf, size_t *rsize) > { > struct bcache_devdata *dd = (struct bcache_devdata *)devdata; > struct bcache *bc = dd->dv_cache; > @@ -337,23 +335,16 @@ bcache_strategy(void *devdata, int rw, d > > /* bypass large requests, or when the cache is inactive */ > if (bc == NULL || > - (offset == 0 && ((size * 2 / bcache_blksize) > bcache_nblks))) { > + ((size * 2 / bcache_blksize) > bcache_nblks)) { > DEBUG("bypass %d from %d", size / bcache_blksize, blk); > bcache_bypasses++; > - return (dd->dv_strategy(dd->dv_devdata, rw, blk, offset, size, buf, > - rsize)); > - } > - > - /* normalize offset */ > - while (offset >= bcache_blksize) { > - blk++; > - offset -= bcache_blksize; > + return (dd->dv_strategy(dd->dv_devdata, rw, blk, size, buf, rsize)); > } > > switch (rw) { > case F_READ: > nblk = size / bcache_blksize; > - if (offset || (size != 0 && nblk == 0)) > + if (size != 0 && nblk == 0) > nblk++; /* read at least one block */ > > ret = 0; > @@ -364,14 +355,10 @@ bcache_strategy(void *devdata, int rw, d > > if (size <= bcache_blksize) > csize = size; > - else { > + else > csize = cblk * bcache_blksize; > - if (offset) > - csize -= (bcache_blksize - offset); > - } > > - ret = read_strategy(devdata, rw, blk, offset, > - csize, buf+total, &isize); > + ret = read_strategy(devdata, rw, blk, csize, buf+total, &isize); > > /* > * we may have error from read ahead, if we have read some data > @@ -382,8 +369,7 @@ bcache_strategy(void *devdata, int rw, d > ret = 0; > break; > } > - blk += (offset+isize) / bcache_blksize; > - offset = 0; > + blk += isize / bcache_blksize; > total += isize; > size -= isize; > nblk = size / bcache_blksize; > @@ -394,7 +380,7 @@ bcache_strategy(void *devdata, int rw, d > > return (ret); > case F_WRITE: > - return write_strategy(devdata, rw, blk, offset, size, buf, rsize); > + return write_strategy(devdata, rw, blk, size, buf, rsize); > } > return -1; > } > > Modified: stable/11/sys/boot/common/bootstrap.h > ============================================================================== > --- stable/11/sys/boot/common/bootstrap.h Mon Feb 6 21:02:26 2017 (r313354) > +++ stable/11/sys/boot/common/bootstrap.h Mon Feb 6 22:03:07 2017 (r313355) > @@ -76,8 +76,8 @@ void bcache_init(u_int nblks, size_t bsi > void bcache_add_dev(int); > void *bcache_allocate(void); > void bcache_free(void *); > -int bcache_strategy(void *devdata, int rw, daddr_t blk, size_t offset, > - size_t size, char *buf, size_t *rsize); > +int bcache_strategy(void *devdata, int rw, daddr_t blk, size_t size, > + char *buf, size_t *rsize); > > /* > * Disk block cache > @@ -85,7 +85,7 @@ int bcache_strategy(void *devdata, int r > struct bcache_devdata > { > int (*dv_strategy)(void *devdata, int rw, daddr_t blk, > - size_t offset, size_t size, char *buf, size_t *rsize); > + size_t size, char *buf, size_t *rsize); > void *dv_devdata; > void *dv_cache; > }; > > Modified: stable/11/sys/boot/common/disk.c > ============================================================================== > --- stable/11/sys/boot/common/disk.c Mon Feb 6 21:02:26 2017 (r313354) > +++ stable/11/sys/boot/common/disk.c Mon Feb 6 22:03:07 2017 (r313355) > @@ -178,7 +178,7 @@ ptblread(void *d, void *buf, size_t bloc > > dev = (struct disk_devdesc *)d; > od = (struct open_disk *)dev->d_opendata; > - return (dev->d_dev->dv_strategy(dev, F_READ, offset, 0, > + return (dev->d_dev->dv_strategy(dev, F_READ, offset, > blocks * od->sectorsize, (char *)buf, NULL)); > } > > @@ -244,7 +244,7 @@ disk_read(struct disk_devdesc *dev, void > int ret; > > od = (struct open_disk *)dev->d_opendata; > - ret = dev->d_dev->dv_strategy(dev, F_READ, dev->d_offset + offset, 0, > + ret = dev->d_dev->dv_strategy(dev, F_READ, dev->d_offset + offset, > blocks * od->sectorsize, buf, NULL); > > return (ret); > @@ -257,7 +257,7 @@ disk_write(struct disk_devdesc *dev, voi > int ret; > > od = (struct open_disk *)dev->d_opendata; > - ret = dev->d_dev->dv_strategy(dev, F_WRITE, dev->d_offset + offset, 0, > + ret = dev->d_dev->dv_strategy(dev, F_WRITE, dev->d_offset + offset, > blocks * od->sectorsize, buf, NULL); > > return (ret); > > Modified: stable/11/sys/boot/common/md.c > ============================================================================== > --- stable/11/sys/boot/common/md.c Mon Feb 6 21:02:26 2017 (r313354) > +++ stable/11/sys/boot/common/md.c Mon Feb 6 22:03:07 2017 (r313355) > @@ -60,7 +60,7 @@ static struct { > > /* devsw I/F */ > static int md_init(void); > -static int md_strategy(void *, int, daddr_t, size_t, size_t, char *, size_t *); > +static int md_strategy(void *, int, daddr_t, size_t, char *, size_t *); > static int md_open(struct open_file *, ...); > static int md_close(struct open_file *); > static void md_print(int); > @@ -84,7 +84,7 @@ md_init(void) > } > > static int > -md_strategy(void *devdata, int rw, daddr_t blk, size_t offset, size_t size, > +md_strategy(void *devdata, int rw, daddr_t blk, size_t size, > char *buf, size_t *rsize) > { > struct devdesc *dev = (struct devdesc *)devdata; > > Modified: stable/11/sys/boot/efi/libefi/efipart.c > ============================================================================== > --- stable/11/sys/boot/efi/libefi/efipart.c Mon Feb 6 21:02:26 2017 (r313354) > +++ stable/11/sys/boot/efi/libefi/efipart.c Mon Feb 6 22:03:07 2017 (r313355) > @@ -41,10 +41,8 @@ __FBSDID("$FreeBSD$"); > static EFI_GUID blkio_guid = BLOCK_IO_PROTOCOL; > > static int efipart_init(void); > -static int efipart_strategy(void *, int, daddr_t, size_t, size_t, char *, > - size_t *); > -static int efipart_realstrategy(void *, int, daddr_t, size_t, size_t, char *, > - size_t *); > +static int efipart_strategy(void *, int, daddr_t, size_t, char *, size_t *); > +static int efipart_realstrategy(void *, int, daddr_t, size_t, char *, size_t *); > static int efipart_open(struct open_file *, ...); > static int efipart_close(struct open_file *); > static void efipart_print(int); > @@ -284,8 +282,8 @@ efipart_readwrite(EFI_BLOCK_IO *blkio, i > } > > static int > -efipart_strategy(void *devdata, int rw, daddr_t blk, size_t offset, > - size_t size, char *buf, size_t *rsize) > +efipart_strategy(void *devdata, int rw, daddr_t blk, size_t size, > + char *buf, size_t *rsize) > { > struct bcache_devdata bcd; > struct devdesc *dev; > @@ -294,13 +292,12 @@ efipart_strategy(void *devdata, int rw, > bcd.dv_strategy = efipart_realstrategy; > bcd.dv_devdata = devdata; > bcd.dv_cache = PD(dev).pd_bcache; > - return (bcache_strategy(&bcd, rw, blk, offset, size, > - buf, rsize)); > + return (bcache_strategy(&bcd, rw, blk, size, buf, rsize)); > } > > static int > -efipart_realstrategy(void *devdata, int rw, daddr_t blk, size_t offset, > - size_t size, char *buf, size_t *rsize) > +efipart_realstrategy(void *devdata, int rw, daddr_t blk, size_t size, > + char *buf, size_t *rsize) > { > struct devdesc *dev = (struct devdesc *)devdata; > EFI_BLOCK_IO *blkio; > > Modified: stable/11/sys/boot/i386/libfirewire/firewire.c > ============================================================================== > --- stable/11/sys/boot/i386/libfirewire/firewire.c Mon Feb 6 21:02:26 2017 (r313354) > +++ stable/11/sys/boot/i386/libfirewire/firewire.c Mon Feb 6 22:03:07 2017 (r313355) > @@ -66,7 +66,7 @@ struct crom_src_buf { > > static int fw_init(void); > static int fw_strategy(void *devdata, int flag, daddr_t dblk, > - size_t offset, size_t size, char *buf, size_t *rsize); > + size_t size, char *buf, size_t *rsize); > static int fw_open(struct open_file *f, ...); > static int fw_close(struct open_file *f); > static void fw_print(int verbose); > @@ -201,7 +201,7 @@ fw_cleanup() > } > > static int > -fw_strategy(void *devdata, int rw, daddr_t dblk, size_t offset, size_t size, > +fw_strategy(void *devdata, int rw, daddr_t dblk, size_t size, > char *buf, size_t *rsize) > { > return (EIO); > > Modified: stable/11/sys/boot/i386/libi386/bioscd.c > ============================================================================== > --- stable/11/sys/boot/i386/libi386/bioscd.c Mon Feb 6 21:02:26 2017 (r313354) > +++ stable/11/sys/boot/i386/libi386/bioscd.c Mon Feb 6 22:03:07 2017 (r313355) > @@ -95,9 +95,9 @@ static int nbcinfo = 0; > static int bc_read(int unit, daddr_t dblk, int blks, caddr_t dest); > static int bc_init(void); > static int bc_strategy(void *devdata, int flag, daddr_t dblk, > - size_t offset, size_t size, char *buf, size_t *rsize); > + size_t size, char *buf, size_t *rsize); > static int bc_realstrategy(void *devdata, int flag, daddr_t dblk, > - size_t offset, size_t size, char *buf, size_t *rsize); > + size_t size, char *buf, size_t *rsize); > static int bc_open(struct open_file *f, ...); > static int bc_close(struct open_file *f); > static void bc_print(int verbose); > @@ -231,7 +231,7 @@ bc_close(struct open_file *f) > } > > static int > -bc_strategy(void *devdata, int rw, daddr_t dblk, size_t offset, size_t size, > +bc_strategy(void *devdata, int rw, daddr_t dblk, size_t size, > char *buf, size_t *rsize) > { > struct bcache_devdata bcd; > @@ -242,11 +242,11 @@ bc_strategy(void *devdata, int rw, daddr > bcd.dv_devdata = devdata; > bcd.dv_cache = BC(dev).bc_bcache; > > - return (bcache_strategy(&bcd, rw, dblk, offset, size, buf, rsize)); > + return (bcache_strategy(&bcd, rw, dblk, size, buf, rsize)); > } > > static int > -bc_realstrategy(void *devdata, int rw, daddr_t dblk, size_t offset, size_t size, > +bc_realstrategy(void *devdata, int rw, daddr_t dblk, size_t size, > char *buf, size_t *rsize) > { > struct i386_devdesc *dev; > > Modified: stable/11/sys/boot/i386/libi386/biosdisk.c > ============================================================================== > --- stable/11/sys/boot/i386/libi386/biosdisk.c Mon Feb 6 21:02:26 2017 (r313354) > +++ stable/11/sys/boot/i386/libi386/biosdisk.c Mon Feb 6 22:03:07 2017 (r313355) > @@ -128,10 +128,10 @@ static int bd_write(struct disk_devdesc > static int bd_int13probe(struct bdinfo *bd); > > static int bd_init(void); > -static int bd_strategy(void *devdata, int flag, daddr_t dblk, size_t offset, > - size_t size, char *buf, size_t *rsize); > -static int bd_realstrategy(void *devdata, int flag, daddr_t dblk, size_t offset, > - size_t size, char *buf, size_t *rsize); > +static int bd_strategy(void *devdata, int flag, daddr_t dblk, size_t size, > + char *buf, size_t *rsize); > +static int bd_realstrategy(void *devdata, int flag, daddr_t dblk, size_t size, > + char *buf, size_t *rsize); > static int bd_open(struct open_file *f, ...); > static int bd_close(struct open_file *f); > static int bd_ioctl(struct open_file *f, u_long cmd, void *data); > @@ -478,7 +478,7 @@ bd_ioctl(struct open_file *f, u_long cmd > } > > static int > -bd_strategy(void *devdata, int rw, daddr_t dblk, size_t offset, size_t size, > +bd_strategy(void *devdata, int rw, daddr_t dblk, size_t size, > char *buf, size_t *rsize) > { > struct bcache_devdata bcd; > @@ -488,12 +488,12 @@ bd_strategy(void *devdata, int rw, daddr > bcd.dv_strategy = bd_realstrategy; > bcd.dv_devdata = devdata; > bcd.dv_cache = BD(dev).bd_bcache; > - return (bcache_strategy(&bcd, rw, dblk + dev->d_offset, offset, > + return (bcache_strategy(&bcd, rw, dblk + dev->d_offset, > size, buf, rsize)); > } > > static int > -bd_realstrategy(void *devdata, int rw, daddr_t dblk, size_t offset, size_t size, > +bd_realstrategy(void *devdata, int rw, daddr_t dblk, size_t size, > char *buf, size_t *rsize) > { > struct disk_devdesc *dev = (struct disk_devdesc *)devdata; > > Modified: stable/11/sys/boot/i386/libi386/pxe.c > ============================================================================== > --- stable/11/sys/boot/i386/libi386/pxe.c Mon Feb 6 21:02:26 2017 (r313354) > +++ stable/11/sys/boot/i386/libi386/pxe.c Mon Feb 6 22:03:07 2017 (r313355) > @@ -72,7 +72,7 @@ static void bangpxe_call(int func); > > static int pxe_init(void); > static int pxe_strategy(void *devdata, int flag, daddr_t dblk, > - size_t offset, size_t size, char *buf, size_t *rsize); > + size_t size, char *buf, size_t *rsize); > static int pxe_open(struct open_file *f, ...); > static int pxe_close(struct open_file *f); > static void pxe_print(int verbose); > @@ -247,8 +247,8 @@ pxe_init(void) > > > static int > -pxe_strategy(void *devdata, int flag, daddr_t dblk, size_t offset, size_t size, > - char *buf, size_t *rsize) > +pxe_strategy(void *devdata, int flag, daddr_t dblk, size_t size, > + char *buf, size_t *rsize) > { > return (EIO); > } > > Modified: stable/11/sys/boot/mips/beri/loader/beri_disk_cfi.c > ============================================================================== > --- stable/11/sys/boot/mips/beri/loader/beri_disk_cfi.c Mon Feb 6 21:02:26 2017 (r313354) > +++ stable/11/sys/boot/mips/beri/loader/beri_disk_cfi.c Mon Feb 6 22:03:07 2017 (r313355) > @@ -45,7 +45,7 @@ static int beri_cfi_disk_init(void); > static int beri_cfi_disk_open(struct open_file *, ...); > static int beri_cfi_disk_close(struct open_file *); > static void beri_cfi_disk_cleanup(void); > -static int beri_cfi_disk_strategy(void *, int, daddr_t, size_t, size_t, > +static int beri_cfi_disk_strategy(void *, int, daddr_t, size_t, > > *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?7039cd35-17ea-e811-4eb4-cc51ca24e120>