Commit 2f59f0bc authored by HardenedBSD Sync Service's avatar HardenedBSD Sync Service
Browse files

Merge branch 'freebsd/current/main' into hardened/current/master

parents 9a99a358 4a365e86
......@@ -14,7 +14,7 @@ all:
@echo "make links or tags only"
# Directories in which to place amd64 tags links
DAMD64= acpica amd64 ia32 include linux linux32 pci vmm
DAMD64= acpica amd64 ia32 include linux linux32 pci sgx vmm
links::
-for i in ${COMMDIR1}; do \
......@@ -22,13 +22,13 @@ links::
-for i in ${COMMDIR2}; do \
(cd $$i && { rm -f tags; ln -s ../../${TAGDIR}/tags tags; }) done
-for i in ${DAMD64}; do \
(cd $$i && { rm -f tags; ln -s ../tags tags; }) done
(cd ${SYS}/amd64/$$i && { rm -f tags; ln -s ../tags tags; }) done
SAMD64= ${SYS}/amd64/acpica/*.[ch] \
${SYS}/amd64/amd64/*.[ch] ${SYS}/amd64/ia32/*.[ch] \
${SYS}/amd64/include/*.[ch] ${SYS}/amd64/linux/*.[ch] \
${SYS}/amd64/linux32/*.[ch] ${SYS}/amd64/pci/*.[ch] \
${SYS}/amd64/vmm/*.[ch]
${SYS}/amd64/sgx/*.[ch] ${SYS}/amd64/vmm/*.[ch]
AAMD64= ${SYS}/amd64/amd64/*.S
tags::
......@@ -38,3 +38,5 @@ tags::
>> tags
sort -o tags tags
chmod 444 tags
rm -f ${SYS}/amd64/tags
mv tags ${SYS}/amd64/tags
......@@ -12,12 +12,10 @@ SYS?= ${.CURDIR}/..
COMM= ${SYS}/sys/vnode.h \
${SYS}/dev/alc/*.[ch] \
${SYS}/dev/en/*.[ch] \
${SYS}/dev/iicbus/*.[ch] \
${SYS}/dev/isp/*.[ch] \
${SYS}/dev/ppbus/*.[ch] \
${SYS}/dev/smbus/*.[ch] \
${SYS}/dev/vx/*.[ch] \
${SYS}/fs/autofs/*.[ch] \
${SYS}/fs/cd9660/*.[ch] \
${SYS}/fs/cuse/*.[ch] \
......@@ -44,7 +42,6 @@ COMM= ${SYS}/sys/vnode.h \
${SYS}/netinet/*.[ch] \
${SYS}/netinet6/*.[ch] \
${SYS}/netipsec/*.[ch] \
${SYS}/netnatm/*.[ch] \
${SYS}/ddb/*.[ch] \
${SYS}/ufs/ffs/*.[ch] \
${SYS}/ufs/ufs/*.[ch] \
......@@ -58,19 +55,16 @@ COMMDIR1= ${SYS}/conf \
${SYS}/netinet \
${SYS}/netinet6 \
${SYS}/netipsec \
${SYS}/netnatm \
${SYS}/ddb \
${SYS}/vm \
${SYS}/sys
COMMDIR2= ${SYS}/dev/alc \
${SYS}/dev/en \
${SYS}/dev/iicbus \
${SYS}/dev/isp \
${SYS}/dev/md \
${SYS}/dev/ppbus \
${SYS}/dev/smbus \
${SYS}/dev/vx \
${SYS}/fs/autofs \
${SYS}/fs/cd9660 \
${SYS}/fs/cuse \
......
......@@ -63,6 +63,7 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_extern.h>
#include <geom/geom.h>
#include <geom/geom_vfs.h>
#include <ufs/ufs/extattr.h>
#include <ufs/ufs/quota.h>
......@@ -2554,22 +2555,16 @@ readblock(vp, bp, lbn)
ufs2_daddr_t lbn;
{
struct inode *ip;
struct bio *bip;
struct fs *fs;
ip = VTOI(vp);
fs = ITOFS(ip);
bip = g_alloc_bio();
bip->bio_cmd = BIO_READ;
bip->bio_offset = dbtob(fsbtodb(fs, blkstofrags(fs, lbn)));
bip->bio_data = bp->b_data;
bip->bio_length = bp->b_bcount;
bip->bio_done = NULL;
g_io_request(bip, ITODEVVP(ip)->v_bufobj.bo_private);
bp->b_error = biowait(bip, "snaprdb");
g_destroy_bio(bip);
bp->b_iocmd = BIO_READ;
bp->b_iooffset = dbtob(fsbtodb(fs, blkstofrags(fs, lbn)));
bp->b_iodone = bdone;
g_vfs_strategy(&ITODEVVP(ip)->v_bufobj, bp);
bufwait(bp);
return (bp->b_error);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment