Author: markj
Date: Fri Feb 20 20:49:00 2015
New Revision: 279089
URL: https://svnweb.freebsd.org/changeset/base/279089
Log:
Don't specify a resid parameter if we're just going to ignore it. Instead,
let vn_rdwr() check for short reads.
MFC after: 3 days
Sponsored by: EMC / Isilon Storage Division
Modified:
head/sys/kern/kern_ctf.c
Modified: head/sys/kern/kern_ctf.c
==============================================================================
--- head/sys/kern/kern_ctf.c Fri Feb 20 20:33:43 2015 (r279088)
+++ head/sys/kern/kern_ctf.c Fri Feb 20 20:49:00 2015 (r279089)
@@ -68,7 +68,6 @@ link_elf_ctf_get(linker_file_t lf, linke
int flags;
int i;
int nbytes;
- ssize_t resid;
size_t sz;
struct nameidata nd;
struct thread *td = curthread;
@@ -125,7 +124,7 @@ link_elf_ctf_get(linker_file_t lf, linke
/* Read the ELF header. */
if ((error = vn_rdwr(UIO_READ, nd.ni_vp, hdr, sizeof(*hdr),
- 0, UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED, &resid,
+ 0, UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED, NULL,
td)) != 0)
goto out;
@@ -148,7 +147,7 @@ link_elf_ctf_get(linker_file_t lf, linke
/* Read all the section headers */
if ((error = vn_rdwr(UIO_READ, nd.ni_vp, (caddr_t)shdr, nbytes,
hdr->e_shoff, UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED,
- &resid, td)) != 0)
+ NULL, td)) != 0)
goto out;
/*
@@ -170,8 +169,7 @@ link_elf_ctf_get(linker_file_t lf, linke
/* Read the section header strings. */
if ((error = vn_rdwr(UIO_READ, nd.ni_vp, shstrtab,
shdr[hdr->e_shstrndx].sh_size, shdr[hdr->e_shstrndx].sh_offset,
- UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED, &resid,
- td)) != 0)
+ UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED, NULL, td)) != 0)
goto out;
/* Search for the section containing the CTF data. */
@@ -190,7 +188,7 @@ link_elf_ctf_get(linker_file_t lf, linke
/* Read the CTF header. */
if ((error = vn_rdwr(UIO_READ, nd.ni_vp, ctf_hdr, sizeof(ctf_hdr),
shdr[i].sh_offset, UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred,
- NOCRED, &resid, td)) != 0)
+ NOCRED, NULL, td)) != 0)
goto out;
/* Check the CTF magic number. (XXX check for big endian!) */
@@ -249,7 +247,7 @@ link_elf_ctf_get(linker_file_t lf, linke
*/
if ((error = vn_rdwr(UIO_READ, nd.ni_vp, raw == NULL ? ctftab : raw,
shdr[i].sh_size, shdr[i].sh_offset, UIO_SYSSPACE, IO_NODELOCKED,
- td->td_ucred, NOCRED, &resid, td)) != 0)
+ td->td_ucred, NOCRED, NULL, td)) != 0)
goto out;
/* Check if decompression is required. */
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
