svn commit: r251726 - stable/9/lib/libstand

Pedro F. Giffuni pfg at FreeBSD.org
Fri Jun 14 02:51:04 UTC 2013


Author: pfg
Date: Fri Jun 14 02:51:03 2013
New Revision: 251726
URL: http://svnweb.freebsd.org/changeset/base/251726

Log:
  MFC	r251561:
  
  libstand: Reset the seek pointer in ext2fs as done in UFS.
  
  Reset the seek pointer to 0 when a file is successfully opened,
  since otherwise the initial seek offset will contain the directory
  offset of the filesystem block that contained its directory entry.
  This bug was mostly harmless because typically the directory is
  less than one filesystem block in size so the offset would be zero.
  It did however generally break loading a kernel from the (large)
  kernel compile directory.
  
  Also reset the seek pointer when a new inode is opened in read_inode(),
  though this is not actually necessary now because all callers set
  it afterwards.
  
  PR:		177328
  Submitted by:	Eric van Gyzen
  Reviewed by:	iedowse

Modified:
  stable/9/lib/libstand/ext2fs.c
Directory Properties:
  stable/9/   (props changed)
  stable/9/lib/   (props changed)
  stable/9/lib/libstand/   (props changed)

Modified: stable/9/lib/libstand/ext2fs.c
==============================================================================
--- stable/9/lib/libstand/ext2fs.c	Fri Jun 14 02:25:40 2013	(r251725)
+++ stable/9/lib/libstand/ext2fs.c	Fri Jun 14 02:51:03 2013	(r251726)
@@ -536,6 +536,7 @@ ext2fs_open(const char *upath, struct op
 	 * Found terminal component.
 	 */
 	error = 0;
+	fp->f_seekp = 0;
 out:
 	if (buf)
 		free(buf);
@@ -584,6 +585,7 @@ read_inode(ino_t inumber, struct open_fi
 	for (level = 0; level < NIADDR; level++)
 		fp->f_blkno[level] = -1;
 	fp->f_buf_blkno = -1;
+	fp->f_seekp = 0;
 
 out:
 	free(buf);


More information about the svn-src-stable-9 mailing list